Update contrib/restricted/boost/intrusive to 1.82.0

12 files changed, 45 insertions, 21 deletions

diff --git a/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
index 261b65dc85..938feb84b3 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.darwin-x86_64.txt
@@ -16,7 +16,6 @@ target_link_libraries(restricted-boost-intrusive INTERFACE
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container_hash
-  restricted-boost-core
   restricted-boost-move
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/intrusive/CMakeLists.linux-aarch64.txt
index 0f15706c63..ad8b66772c 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.linux-aarch64.txt
@@ -17,7 +17,6 @@ target_link_libraries(restricted-boost-intrusive INTERFACE
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container_hash
-  restricted-boost-core
   restricted-boost-move
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
index 0f15706c63..ad8b66772c 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.linux-x86_64.txt
@@ -17,7 +17,6 @@ target_link_libraries(restricted-boost-intrusive INTERFACE
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container_hash
-  restricted-boost-core
   restricted-boost-move
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.windows-x86_64.txt b/contrib/restricted/boost/intrusive/CMakeLists.windows-x86_64.txt
index 261b65dc85..938feb84b3 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.windows-x86_64.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.windows-x86_64.txt
@@ -16,7 +16,6 @@ target_link_libraries(restricted-boost-intrusive INTERFACE
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container_hash
-  restricted-boost-core
   restricted-boost-move
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/circular_list_algorithms.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/circular_list_algorithms.hpp
index a4efc0237a..ab34c7e309 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/circular_list_algorithms.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/circular_list_algorithms.hpp
@@ -16,8 +16,8 @@
 
 #include <boost/intrusive/detail/config_begin.hpp>
 #include <boost/intrusive/intrusive_fwd.hpp>
+#include <boost/intrusive/detail/workaround.hpp>
 #include <boost/intrusive/detail/algo_type.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <cstddef>
 
 #if defined(BOOST_HAS_PRAGMA_ONCE)
@@ -405,7 +405,7 @@ class circular_list_algorithms
             new_f = cur;
             bcur = cur;
             cur  = node_traits::get_next(cur);
-            BOOST_TRY{
+            BOOST_INTRUSIVE_TRY{
                //Main loop
                while(cur != end){
                   if(pred(cur)){ //Might throw
@@ -426,12 +426,12 @@ class circular_list_algorithms
                   }
                }
             }
-            BOOST_CATCH(...){
+            BOOST_INTRUSIVE_CATCH(...){
                node_traits::set_next    (last_to_remove, new_f);
                node_traits::set_previous(new_f, last_to_remove);
-               BOOST_RETHROW;
+               BOOST_INTRUSIVE_RETHROW;
             }
-            BOOST_CATCH_END
+            BOOST_INTRUSIVE_CATCH_END
             node_traits::set_next(last_to_remove, new_f);
             node_traits::set_previous(new_f, last_to_remove);
             break;
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/array_initializer.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/array_initializer.hpp
index 1b6a933294..554edadfa4 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/array_initializer.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/array_initializer.hpp
@@ -22,7 +22,7 @@
 #endif
 
 #include <boost/config.hpp>
-#include <boost/core/no_exceptions_support.hpp>
+#include <boost/intrusive/detail/workaround.hpp>
 #include <boost/move/detail/placement_new.hpp>
 #include <boost/move/detail/force_ptr.hpp>
 
@@ -55,20 +55,20 @@ class array_initializer
    {
       char *init_buf = (char*)rawbuf;
       std::size_t i = 0;
-      BOOST_TRY{
+      BOOST_INTRUSIVE_TRY{
          for(; i != N; ++i){
             ::new(init_buf, boost_move_new_t()) T(init);
             init_buf += sizeof(T);
          }
       }
-      BOOST_CATCH(...){
+      BOOST_INTRUSIVE_CATCH(...){
          while(i--){
             init_buf -= sizeof(T);
             move_detail::force_ptr<T*>(init_buf)->~T();
          }
-         BOOST_RETHROW;
+         BOOST_INTRUSIVE_RETHROW;
       }
-      BOOST_CATCH_END
+      BOOST_INTRUSIVE_CATCH_END
    }
 
    operator T* ()
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/common_slist_algorithms.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/common_slist_algorithms.hpp
index e7aba10dca..8310231e31 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/common_slist_algorithms.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/common_slist_algorithms.hpp
@@ -22,9 +22,9 @@
 #endif
 
 #include <boost/intrusive/intrusive_fwd.hpp>
+#include <boost/intrusive/detail/workaround.hpp>
 #include <boost/intrusive/detail/assert.hpp>
 #include <boost/intrusive/detail/algo_type.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <cstddef>
 
 namespace boost {
@@ -126,7 +126,7 @@ class common_slist_algorithms
             new_f = cur;
             bcur = cur;
             cur  = node_traits::get_next(cur);
-            BOOST_TRY{
+            BOOST_INTRUSIVE_TRY{
                //Main loop
                while(cur != end){
                   if(pred(cur)){ //Might throw
@@ -145,11 +145,11 @@ class common_slist_algorithms
                   }
                }
             }
-            BOOST_CATCH(...){
+            BOOST_INTRUSIVE_CATCH(...){
                node_traits::set_next(last_to_remove, new_f);
-               BOOST_RETHROW;
+               BOOST_INTRUSIVE_RETHROW;
             }
-            BOOST_CATCH_END
+            BOOST_INTRUSIVE_CATCH_END
             node_traits::set_next(last_to_remove, new_f);
             break;
          }
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/hook_traits.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/hook_traits.hpp
index b7164365d6..06713487fc 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/hook_traits.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/hook_traits.hpp
@@ -28,6 +28,7 @@
 #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 {
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/slist_iterator.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/slist_iterator.hpp
index d6ef336afc..9c5ee27470 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/slist_iterator.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/slist_iterator.hpp
@@ -27,6 +27,7 @@
 #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 {
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/workaround.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/workaround.hpp
index 1e18d206c8..0011fb5bfb 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/workaround.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/detail/workaround.hpp
@@ -55,4 +55,30 @@
    #define BOOST_INTRUSIVE_FORCEINLINE BOOST_FORCEINLINE
 #endif
 
+#if !(defined BOOST_NO_EXCEPTIONS)
+#    define BOOST_INTRUSIVE_TRY { try
+#    define BOOST_INTRUSIVE_CATCH(x) catch(x)
+#    define BOOST_INTRUSIVE_RETHROW throw;
+#    define BOOST_INTRUSIVE_CATCH_END }
+#else
+#    if !defined(BOOST_MSVC) || BOOST_MSVC >= 1900
+#        define BOOST_INTRUSIVE_TRY { if (true)
+#        define BOOST_INTRUSIVE_CATCH(x) else if (false)
+#    else
+// warning C4127: conditional expression is constant
+#        define BOOST_INTRUSIVE_TRY { \
+             __pragma(warning(push)) \
+             __pragma(warning(disable: 4127)) \
+             if (true) \
+             __pragma(warning(pop))
+#        define BOOST_INTRUSIVE_CATCH(x) else \
+             __pragma(warning(push)) \
+             __pragma(warning(disable: 4127)) \
+             if (false) \
+             __pragma(warning(pop))
+#    endif
+#    define BOOST_INTRUSIVE_RETHROW
+#    define BOOST_INTRUSIVE_CATCH_END }
+#endif
+
 #endif   //#ifndef BOOST_INTRUSIVE_DETAIL_WORKAROUND_HPP
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/list.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/list.hpp
index 23b3c10070..62291b4809 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/list.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/list.hpp
@@ -1348,7 +1348,7 @@ class list_impl
             BOOST_INTRUSIVE_INVARIANT_ASSERT(this->priv_size_traits().get_size() == 0);
          return;
       }
-      size_t node_count = 0;
+      size_t node_count = 0; (void)node_count;
       const_node_ptr p = header_ptr;
       while (true)
       {
diff --git a/contrib/restricted/boost/intrusive/include/boost/intrusive/slist.hpp b/contrib/restricted/boost/intrusive/include/boost/intrusive/slist.hpp
index ac64e413fa..7319bf3132 100644
--- a/contrib/restricted/boost/intrusive/include/boost/intrusive/slist.hpp
+++ b/contrib/restricted/boost/intrusive/include/boost/intrusive/slist.hpp
@@ -1936,7 +1936,7 @@ class slist_impl
          BOOST_INTRUSIVE_INVARIANT_ASSERT(!constant_time_size || this->priv_size_traits().get_size() == 0);
          return;
       }
-      size_t node_count = 0;
+      size_t node_count = 0; (void)node_count;
       const_node_ptr p = header_ptr;
       while (true)
       {