Update contrib/restricted/boost/multi_index to 1.83.0

3 files changed, 16 insertions, 13 deletions

diff --git a/contrib/restricted/boost/multi_index/include/boost/multi_index/detail/ord_index_impl.hpp b/contrib/restricted/boost/multi_index/include/boost/multi_index/detail/ord_index_impl.hpp
index 0af68f9543..cd7281e676 100644
--- a/contrib/restricted/boost/multi_index/include/boost/multi_index/detail/ord_index_impl.hpp
+++ b/contrib/restricted/boost/multi_index/include/boost/multi_index/detail/ord_index_impl.hpp
@@ -341,12 +341,7 @@ public:
   void insert(InputIterator first,InputIterator last)
   {
     BOOST_MULTI_INDEX_ORD_INDEX_CHECK_INVARIANT;
-    index_node_type* hint=header(); /* end() */
-    for(;first!=last;++first){
-      hint=this->final_insert_ref_(
-        *first,static_cast<final_node_type*>(hint)).first;
-      index_node_type::increment(hint);
-    }
+    for(;first!=last;++first)this->final_insert_ref_(*first);
   }
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
diff --git a/contrib/restricted/boost/multi_index/include/boost/multi_index_container.hpp b/contrib/restricted/boost/multi_index/include/boost/multi_index_container.hpp
index 0b7d695d83..6d6127807a 100644
--- a/contrib/restricted/boost/multi_index/include/boost/multi_index_container.hpp
+++ b/contrib/restricted/boost/multi_index/include/boost/multi_index_container.hpp
@@ -1119,7 +1119,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
   template<class Archive>
   void save(Archive& ar,const unsigned int version)const
   {
-    const unsigned long                             s(size_());
+    const std::size_t                               s(size_());
     const detail::serialization_version<value_type> value_version;
     ar<<core::make_nvp("count",s);
     ar<<core::make_nvp("value_version",value_version);
@@ -1143,25 +1143,31 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
     BOOST_MULTI_INDEX_CHECK_INVARIANT;
 
     clear_(); 
-    unsigned long                             s;
+    std::size_t                               s;
     detail::serialization_version<value_type> value_version;
     if(version<1){
       std::size_t sz;
       ar>>core::make_nvp("count",sz);
-      s=static_cast<unsigned long>(sz);
+      s=static_cast<std::size_t>(sz);
     }
     else if(version<3){
 #if defined(BOOST_MULTI_INDEX_ENABLE_SERIALIZATION_COMPATIBILITY_V2)
       serialization::collection_size_type csz;
       ar>>core::make_nvp("count",csz);
-      s=static_cast<unsigned long>(csz);
+      s=static_cast<std::size_t>(csz);
 #else
       ar>>core::make_nvp("count",s);
 #endif
     }
+    else if(version<4){
+      unsigned long ul;
+      ar>>core::make_nvp("count",ul);
+      s=static_cast<std::size_t>(ul);
+    }
     else{
       ar>>core::make_nvp("count",s);
     }
+
     if(version<2){
       value_version=0;
     }
@@ -1569,6 +1575,8 @@ void swap(
  * class version = 3 : dropped boost::serialization::collection_size_type
  * in favor of unsigned long --this allows us to provide serialization
  * support without including any header from Boost.Serialization.
+ * class version = 4 : uses std::size_t rather than unsigned long (which
+ * is smaller in LLP64 data models).
  */
 
 namespace serialization {
@@ -1577,7 +1585,7 @@ struct version<
   boost::multi_index_container<Value,IndexSpecifierList,Allocator>
 >
 {
-  BOOST_STATIC_CONSTANT(int,value=3);
+  BOOST_STATIC_CONSTANT(int,value=4);
 };
 } /* namespace serialization */
 #endif
diff --git a/contrib/restricted/boost/multi_index/ya.make b/contrib/restricted/boost/multi_index/ya.make
index a21a1cdf24..d63cc16d22 100644
--- a/contrib/restricted/boost/multi_index/ya.make
+++ b/contrib/restricted/boost/multi_index/ya.make
@@ -9,9 +9,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(1.82.0)
+VERSION(1.83.0)
 
-ORIGINAL_SOURCE(https://github.com/boostorg/multi_index/archive/boost-1.82.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/multi_index/archive/boost-1.83.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/boost/assert