From 4d21e8962151d7d6852c5bc861a2f09fed060be5 Mon Sep 17 00:00:00 2001
From: joaquintides <joaquin@tid.es>
Date: Tue, 13 Mar 2018 22:05:01 +0100
Subject: [PATCH] addressed https://svn.boost.org/trac10/ticket/13478

---
 doc/release_notes.html                  | 14 ++++++-
 include/boost/multi_index_container.hpp |  2 +-
 test/test_serialization3.cpp            | 50 ++++++++++++++++++++++++-
 3 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/doc/release_notes.html b/doc/release_notes.html
index b07f2dd..e1818f1 100644
--- a/doc/release_notes.html
+++ b/doc/release_notes.html
@@ -30,6 +30,7 @@ Acknowledgements
 <h2>Contents</h2>
 
 <ul>
+  <li><a href="#boost_1_68">Boost 1.68 release</a></li>
   <li><a href="#boost_1_67">Boost 1.67 release</a></li>
   <li><a href="#boost_1_66">Boost 1.66 release</a></li>
   <li><a href="#boost_1_64">Boost 1.64 release</a></li>
@@ -57,6 +58,17 @@ Acknowledgements
   <li><a href="#boost_1_33">Boost 1.33 release</a></li>
 </ul>
 
+<h2><a name="boost_1_68">Boost 1.68 release</a></h2>
+
+<p>
+<ul>
+  <li>Containers of moveable but non-copyable elements can now be serialized
+    (ticket <a href="https://svn.boost.org/trac10/ticket/13478">#13478</a>).
+    Thanks to S&eacute;bastien Paris for the report.
+  </li>
+</ul>
+</p>
+
 <h2><a name="boost_1_67">Boost 1.67 release</a></h2>
 
 <p>
@@ -572,7 +584,7 @@ Acknowledgements
 
 <br>
 
-<p>Revised January 3rd 2018</p>
+<p>Revised March 13th 2018</p>
 
 <p>&copy; Copyright 2003-2018 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 f0190d5..8843517 100644
--- a/include/boost/multi_index_container.hpp
+++ b/include/boost/multi_index_container.hpp
@@ -960,7 +960,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
 
     for(std::size_t n=0;n<s;++n){
       detail::archive_constructed<Value> value("item",ar,value_version);
-      std::pair<node_type*,bool> p=insert_(
+      std::pair<node_type*,bool> p=insert_rv_(
         value.get(),super::end().get_node());
       if(!p.second)throw_exception(
         archive::archive_exception(
diff --git a/test/test_serialization3.cpp b/test/test_serialization3.cpp
index 6e3c730..f6d2549 100644
--- a/test/test_serialization3.cpp
+++ b/test/test_serialization3.cpp
@@ -1,6 +1,6 @@
 /* Boost.MultiIndex test for serialization, part 3.
  *
- * Copyright 2003-2013 Joaquin M Lopez Munoz.
+ * Copyright 2003-2018 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,6 +11,7 @@
 #include "test_serialization3.hpp"
 #include "test_serialization_template.hpp"
 
+#include <boost/move/core.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -70,6 +71,36 @@ template<> struct version<non_default_ctble>
 } /* namespace serialization */
 } /* namespace boost*/
 
+struct non_copyable
+{
+  non_copyable(int n_=0):n(n_){}
+  non_copyable(BOOST_RV_REF(non_copyable) x):n(x.n){}
+
+  bool operator==(const non_copyable& x)const{return n==x.n;}
+  bool operator<(const non_copyable& x)const{return n<x.n;}
+
+  int n;
+
+private:
+  BOOST_MOVABLE_BUT_NOT_COPYABLE(non_copyable)
+};
+
+#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
+namespace boost{
+namespace serialization{
+#endif
+
+template<class Archive>
+void serialize(Archive& ar,non_copyable& x,const unsigned int)
+{
+  ar&boost::serialization::make_nvp("n",x.n);
+}
+
+#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
+} /* namespace serialization */
+} /* namespace boost*/
+#endif
+
 using namespace boost::multi_index;
 
 void test_serialization3()
@@ -165,4 +196,21 @@ void test_serialization3()
     for(int i=0;i<100;++i)m.insert(non_default_ctble(i));
     test_serialization(m);
   }
+
+  {
+    /* testcase for https://svn.boost.org/trac10/ticket/13478 */
+
+    typedef multi_index_container<
+      non_copyable,
+      indexed_by<
+        ordered_unique<
+          BOOST_MULTI_INDEX_MEMBER(non_copyable,int,n)
+        >
+      >
+    > multi_index_t;
+
+    multi_index_t m;
+    for(int i=0;i<100;++i)m.insert(non_copyable(i));
+    test_serialization(m);
+  }
 }