From 343cb4c6f31333d7d8a369d1f8523f52cbebd055 Mon Sep 17 00:00:00 2001
From: joaquintides <joaquin@tid.es>
Date: Mon, 22 May 2023 13:26:17 +0200
Subject: [PATCH] fixed container size serialization in LLP64

---
 doc/release_notes.html                  |  9 ++++++++-
 include/boost/multi_index_container.hpp | 18 +++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/doc/release_notes.html b/doc/release_notes.html
index 853fed8..f28446b 100644
--- a/doc/release_notes.html
+++ b/doc/release_notes.html
@@ -78,6 +78,13 @@ Acknowledgements
    of equivalent elements
    (<a href="https://github.com/boostorg/multi_index/issues/68">issue #68</a>).
   </li>
+  <li>Serialization now uses <code>std::size_t</code> instead of <code>unsigned long</code>
+    to save and load the size of a <code>multi_index_container</code>
+    (<code>unsigned long</code> is smaller than <code>std::size_t</code> in LLP64 data models).
+    <code>multi_index_container</code> serialization
+    <a href="../../serialization/doc/tutorial.html#versioning">class version</a> has been
+    bumped from 3 to 4 to reflect this change.
+  </li>
 </ul>
 </p>
 
@@ -786,7 +793,7 @@ Acknowledgements
 
 <br>
 
-<p>Revised May 21st 2023</p>
+<p>Revised May 22nd 2023</p>
 
 <p>&copy; Copyright 2003-2023 Joaqu&iacute;n M L&oacute;pez Mu&ntilde;oz.
 Distributed under the Boost Software 
diff --git a/include/boost/multi_index_container.hpp b/include/boost/multi_index_container.hpp
index ac73754..8ac43fc 100644
--- a/include/boost/multi_index_container.hpp
+++ b/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