From ae0bd74390a0ad99946b33d3d882cad87efeb330 Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Wed, 16 Sep 2015 21:02:32 -0500
Subject: [PATCH 1/7] Added support for const-correctness of data for
 output_archives

---
 hpx/runtime/serialization/access.hpp          | 29 +++++++------------
 .../serialization/serialization_fwd.hpp       |  3 --
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/hpx/runtime/serialization/access.hpp b/hpx/runtime/serialization/access.hpp
index a249ed41b7ae..3ba23bbf8e25 100644
--- a/hpx/runtime/serialization/access.hpp
+++ b/hpx/runtime/serialization/access.hpp
@@ -52,7 +52,7 @@ namespace hpx { namespace serialization
                 }
             };
 
-            struct non_intrusive_polymorphic
+            struct non_intrusive
             {
                 // this additional indirection level is needed to
                 // force ADL on the second phase of template lookup.
@@ -74,7 +74,7 @@ namespace hpx { namespace serialization
                 }
             };
 
-            struct usual
+            struct intrusive_usual
             {
                 template <class Archive>
                 static void call(Archive& ar, T& t, unsigned)
@@ -87,22 +87,15 @@ namespace hpx { namespace serialization
             typedef typename boost::mpl::eval_if<
                 hpx::traits::is_intrusive_polymorphic<T>,
                     boost::mpl::identity<intrusive_polymorphic>,
-                    boost::mpl::eval_if<
-                        hpx::traits::is_nonintrusive_polymorphic<T>,
-                            boost::mpl::identity<non_intrusive_polymorphic>,
-                            boost::mpl::eval_if<
-                                boost::mpl::and_<
-                                    boost::mpl::not_<
-                                        hpx::traits::has_serialize<T>
-                                    >,
-                                    boost::is_empty<T>
-                                >,
-                                    boost::mpl::identity<empty>,
-                                    boost::mpl::identity<usual>
-                            >
-
-
-                    >
+                        boost::mpl::eval_if<
+                            hpx::traits::has_serialize<T>,
+                                boost::mpl::identity<intrusive_usual>,
+                                boost::mpl::eval_if<
+                                    boost::is_empty<T>,
+                                        boost::mpl::identity<empty>,
+                                        boost::mpl::identity<non_intrusive>
+                                >
+                        >
             >::type type;
         };
 
diff --git a/hpx/runtime/serialization/serialization_fwd.hpp b/hpx/runtime/serialization/serialization_fwd.hpp
index c03ba122236d..2586522389fe 100644
--- a/hpx/runtime/serialization/serialization_fwd.hpp
+++ b/hpx/runtime/serialization/serialization_fwd.hpp
@@ -42,9 +42,6 @@ namespace hpx { namespace serialization
     template <typename Helper>
     Helper & tracked_pointer(input_archive & ar, boost::uint64_t pos);
 
-    template <typename Archive, typename T>
-    void serialize(Archive & ar, T & t, unsigned);
-
     template <typename T>
     output_archive & operator<<(output_archive & ar, T const & t);
 

From 4eddfa2b8df4b2b0d8984d77b549df4d981f0885 Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Wed, 16 Sep 2015 21:19:31 -0500
Subject: [PATCH 2/7] Splitting serialize_force_adl by archive types

---
 hpx/runtime/serialization/access.hpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hpx/runtime/serialization/access.hpp b/hpx/runtime/serialization/access.hpp
index 3ba23bbf8e25..bd967a6c1bcd 100644
--- a/hpx/runtime/serialization/access.hpp
+++ b/hpx/runtime/serialization/access.hpp
@@ -23,8 +23,14 @@ namespace hpx { namespace serialization
 {
     namespace detail
     {
-        template <class Archive, class T>
-        BOOST_FORCEINLINE void serialize_force_adl(Archive& ar, T& t, unsigned)
+        template <class T> BOOST_FORCEINLINE
+        void serialize_force_adl(output_archive& ar, const T& t, unsigned)
+        {
+            serialize(ar, t, 0);
+        }
+
+        template <class T> BOOST_FORCEINLINE
+        void serialize_force_adl(input_archive& ar, T& t, unsigned)
         {
             serialize(ar, t, 0);
         }

From 26b5875cb6a0c0a5dbccc5dc5c949bd72bcd3b01 Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Fri, 18 Sep 2015 00:42:36 -0500
Subject: [PATCH 3/7] Making global serialize function worse candidate by
 adding sfinae

---
 hpx/runtime/serialization/access.hpp    | 16 +++++++---------
 hpx/runtime/serialization/serialize.hpp | 16 +++++++++++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/hpx/runtime/serialization/access.hpp b/hpx/runtime/serialization/access.hpp
index bd967a6c1bcd..67bf57562f69 100644
--- a/hpx/runtime/serialization/access.hpp
+++ b/hpx/runtime/serialization/access.hpp
@@ -10,6 +10,7 @@
 #include <hpx/runtime/serialization/serialization_fwd.hpp>
 #include <hpx/traits/polymorphic_traits.hpp>
 #include <hpx/traits/has_serialize.hpp>
+#include <hpx/util/decay.hpp>
 
 #include <boost/type_traits/is_empty.hpp>
 #include <boost/mpl/eval_if.hpp>
@@ -23,14 +24,8 @@ namespace hpx { namespace serialization
 {
     namespace detail
     {
-        template <class T> BOOST_FORCEINLINE
-        void serialize_force_adl(output_archive& ar, const T& t, unsigned)
-        {
-            serialize(ar, t, 0);
-        }
-
-        template <class T> BOOST_FORCEINLINE
-        void serialize_force_adl(input_archive& ar, T& t, unsigned)
+        template <class Archive, class T> BOOST_FORCEINLINE
+        void serialize_force_adl(Archive& ar, T& t, unsigned)
         {
             serialize(ar, t, 0);
         }
@@ -85,7 +80,10 @@ namespace hpx { namespace serialization
                 template <class Archive>
                 static void call(Archive& ar, T& t, unsigned)
                 {
-                    t.serialize(ar, 0);
+                    // cast it to let it be run for templated
+                    // member functions
+                    const_cast<typename util::decay<T>::type&>(
+                            t).serialize(ar, 0);
                 }
             };
 
diff --git a/hpx/runtime/serialization/serialize.hpp b/hpx/runtime/serialization/serialize.hpp
index fce9e4bc9a5e..181537b0cd2f 100644
--- a/hpx/runtime/serialization/serialize.hpp
+++ b/hpx/runtime/serialization/serialize.hpp
@@ -13,10 +13,24 @@
 #include <hpx/runtime/serialization/output_archive.hpp>
 #include <hpx/runtime/serialization/detail/size_gatherer_container.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 namespace hpx { namespace serialization
 {
+    // use templated Archive parameter with sfinae
+    // to make these overloads less specialized than any else
+    template <typename Archive, typename T>
+    typename boost::enable_if<
+        boost::is_same<Archive, output_archive> >::type
+    serialize(Archive & ar, const T & t, unsigned)
+    {
+        access::serialize(ar, t, 0);
+    }
+
     template <typename Archive, typename T>
-    void serialize(Archive & ar, T & t, unsigned)
+    typename boost::enable_if<
+        boost::is_same<Archive, input_archive> >::type
+    serialize(Archive & ar, T & t, unsigned)
     {
         access::serialize(ar, t, 0);
     }

From 9e57d5cb039cb602098923a49c65d6cdd2625eb9 Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Fri, 18 Sep 2015 00:43:24 -0500
Subject: [PATCH 4/7] Deleting useless const_cast

---
 hpx/runtime/serialization/output_archive.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hpx/runtime/serialization/output_archive.hpp b/hpx/runtime/serialization/output_archive.hpp
index b310a237301a..7420357d0da5 100644
--- a/hpx/runtime/serialization/output_archive.hpp
+++ b/hpx/runtime/serialization/output_archive.hpp
@@ -125,7 +125,7 @@ namespace hpx { namespace serialization
                 "Can not bitwise serialize a class that is abstract");
             if(disable_array_optimization())
             {
-                serialize(*this, const_cast<T &>(t), 0);
+                serialize(*this, t, 0);
             }
             else
             {

From 48903a8d65cfca8047dccb83960d6cd3a6b5a104 Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Fri, 18 Sep 2015 00:54:21 -0500
Subject: [PATCH 5/7] Deleting allocator serialization

---
 hpx/include/serialization.hpp                 |  1 -
 hpx/runtime/serialization/allocator.hpp       | 24 -------------------
 .../serialization/serialize_buffer.hpp        |  1 -
 3 files changed, 26 deletions(-)
 delete mode 100644 hpx/runtime/serialization/allocator.hpp

diff --git a/hpx/include/serialization.hpp b/hpx/include/serialization.hpp
index 29bf6389db8a..63378dd8ca59 100644
--- a/hpx/include/serialization.hpp
+++ b/hpx/include/serialization.hpp
@@ -9,7 +9,6 @@
 #include <hpx/runtime/serialization/serialization_fwd.hpp>
 #include <hpx/runtime/serialization/serialize.hpp>
 
-#include <hpx/runtime/serialization/allocator.hpp>
 #include <hpx/runtime/serialization/array.hpp>
 #include <hpx/runtime/serialization/intrusive_ptr.hpp>
 #include <hpx/runtime/serialization/map.hpp>
diff --git a/hpx/runtime/serialization/allocator.hpp b/hpx/runtime/serialization/allocator.hpp
deleted file mode 100644
index a87246e34db6..000000000000
--- a/hpx/runtime/serialization/allocator.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//  Copyright (c) 2007-2014 Hartmut Kaiser
-//
-//  Distributed under the 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(HPX_SERIALIZATION_ALLOCATOR_FEB_19_2014_0711PM)
-#define HPX_SERIALIZATION_ALLOCATOR_FEB_19_2014_0711PM
-
-#include <hpx/config.hpp>
-#include <hpx/runtime/serialization/serialize.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-namespace hpx { namespace serialization
-{
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename Archive, typename T>
-    void save(Archive&, std::allocator<T> const&, unsigned int) {}
-
-    ///////////////////////////////////////////////////////////////////////////
-    template <typename Archive, typename T>
-    void load(Archive&, std::allocator<T>&, unsigned int) {}
-}}
-
-#endif
diff --git a/hpx/runtime/serialization/serialize_buffer.hpp b/hpx/runtime/serialization/serialize_buffer.hpp
index 2f7b36437945..192b5e63c8c0 100644
--- a/hpx/runtime/serialization/serialize_buffer.hpp
+++ b/hpx/runtime/serialization/serialize_buffer.hpp
@@ -12,7 +12,6 @@
 
 #include <hpx/runtime/serialization/serialize.hpp>
 #include <hpx/runtime/serialization/array.hpp>
-#include <hpx/runtime/serialization/allocator.hpp>
 
 #include <boost/shared_array.hpp>
 #include <boost/mpl/bool.hpp>

From e2248a8a4fa7fb140463e13953bdb1045e17dc07 Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Fri, 18 Sep 2015 01:09:14 -0500
Subject: [PATCH 6/7] Making serialization for types supported in HPX
 const-correct

---
 hpx/runtime/serialization/complex.hpp |  2 +-
 hpx/runtime/serialization/list.hpp    |  2 +-
 hpx/runtime/serialization/map.hpp     | 10 +++++-----
 hpx/runtime/serialization/set.hpp     |  2 +-
 hpx/runtime/serialization/string.hpp  |  2 +-
 hpx/runtime/serialization/vector.hpp  |  8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/hpx/runtime/serialization/complex.hpp b/hpx/runtime/serialization/complex.hpp
index 7281b664736a..9825bb241ff7 100644
--- a/hpx/runtime/serialization/complex.hpp
+++ b/hpx/runtime/serialization/complex.hpp
@@ -23,7 +23,7 @@ namespace hpx { namespace serialization
     }
 
     template <typename T>
-    void serialize(output_archive& ar, std::complex<T>& c, unsigned)
+    void serialize(output_archive& ar, const std::complex<T>& c, unsigned)
     {
         ar << c.real() << c.imag();
     }
diff --git a/hpx/runtime/serialization/list.hpp b/hpx/runtime/serialization/list.hpp
index 97460eb15346..16f9ca0254b0 100644
--- a/hpx/runtime/serialization/list.hpp
+++ b/hpx/runtime/serialization/list.hpp
@@ -29,7 +29,7 @@ namespace hpx { namespace serialization
     }
 
     template <typename T, typename Allocator>
-    void serialize(output_archive & ar, std::list<T, Allocator> & ls, unsigned)
+    void serialize(output_archive & ar, const std::list<T, Allocator> & ls, unsigned)
     {
         // normal save ...
         ar << ls.size(); //-V128
diff --git a/hpx/runtime/serialization/map.hpp b/hpx/runtime/serialization/map.hpp
index f365df2d1ba5..bf5bded02607 100644
--- a/hpx/runtime/serialization/map.hpp
+++ b/hpx/runtime/serialization/map.hpp
@@ -55,7 +55,7 @@ namespace hpx
             }
 
             template <class Key, class Value>
-            void save_pair_impl(output_archive& ar, std::pair<Key, Value>& t,
+            void save_pair_impl(output_archive& ar, const std::pair<Key, Value>& t,
                 boost::mpl::false_)
             {
                 ar << t.first;
@@ -63,7 +63,7 @@ namespace hpx
             }
 
             template <class Key, class Value>
-            void save_pair_impl(output_archive& ar, std::pair<Key, Value>& t,
+            void save_pair_impl(output_archive& ar, const std::pair<Key, Value>& t,
                 boost::mpl::true_)
             {
                 if (!has_array_optimization(ar))
@@ -84,7 +84,7 @@ namespace hpx
         }
 
         template <class Key, class Value>
-        void serialize(output_archive& ar, std::pair<Key, Value>& t, unsigned)
+        void serialize(output_archive& ar, const std::pair<Key, Value>& t, unsigned)
         {
             typedef std::pair<Key, Value> pair_type;
             typedef typename traits::is_bitwise_serializable<pair_type> optimized;
@@ -110,12 +110,12 @@ namespace hpx
 
         template <class Key, class Value, class Comp, class Alloc>
         void serialize(output_archive& ar,
-            std::map<Key, Value, Comp, Alloc>& t, unsigned)
+            const std::map<Key, Value, Comp, Alloc>& t, unsigned)
         {
             typedef typename std::map<Key, Value, Comp, Alloc>::value_type value_type;
 
             ar << t.size(); //-V128
-            for(value_type& val : t)
+            for(const value_type& val : t)
             {
                 ar << val;
             }
diff --git a/hpx/runtime/serialization/set.hpp b/hpx/runtime/serialization/set.hpp
index 90c83e58ef84..32cd95deef06 100644
--- a/hpx/runtime/serialization/set.hpp
+++ b/hpx/runtime/serialization/set.hpp
@@ -27,7 +27,7 @@ namespace hpx { namespace serialization
     }
 
     template <class T, class Compare, class Allocator>
-    void serialize(output_archive & ar, std::set<T, Compare, Allocator> & set, unsigned)
+    void serialize(output_archive & ar, const std::set<T, Compare, Allocator> & set, unsigned)
     {
         boost::uint64_t size = set.size();
         ar << size;
diff --git a/hpx/runtime/serialization/string.hpp b/hpx/runtime/serialization/string.hpp
index 6904ba1edeaf..0829ec02f630 100644
--- a/hpx/runtime/serialization/string.hpp
+++ b/hpx/runtime/serialization/string.hpp
@@ -31,7 +31,7 @@ namespace hpx { namespace serialization
 
     // save string
     template <typename Char, typename CharTraits, typename Allocator>
-    void serialize(output_archive & ar, std::basic_string<Char, CharTraits,
+    void serialize(output_archive & ar, const std::basic_string<Char, CharTraits,
         Allocator> & s, unsigned)
     {
         ar << s.size(); //-V128
diff --git a/hpx/runtime/serialization/vector.hpp b/hpx/runtime/serialization/vector.hpp
index 64643e4e5a76..847182529f37 100644
--- a/hpx/runtime/serialization/vector.hpp
+++ b/hpx/runtime/serialization/vector.hpp
@@ -86,7 +86,7 @@ namespace hpx { namespace serialization
 
     // save vector<T>
     template <typename T, typename Allocator>
-    void save_impl(output_archive & ar, std::vector<T, Allocator> & vs,
+    void save_impl(output_archive & ar, const std::vector<T, Allocator> & vs,
         boost::mpl::false_)
     {
         // normal save ...
@@ -98,7 +98,7 @@ namespace hpx { namespace serialization
     }
 
     template <typename T, typename Allocator>
-    void save_impl(output_archive & ar, std::vector<T, Allocator> & v, boost::mpl::true_)
+    void save_impl(output_archive & ar, const std::vector<T, Allocator> & v, boost::mpl::true_)
     {
         if(!has_array_optimization(ar))
         {
@@ -113,7 +113,7 @@ namespace hpx { namespace serialization
     }
 
     template <typename Allocator>
-    void serialize(output_archive & ar, std::vector<bool, Allocator> & v, unsigned)
+    void serialize(output_archive & ar, const std::vector<bool, Allocator> & v, unsigned)
     {
         typedef typename std::vector<bool, Allocator>::size_type size_type;
         ar << v.size(); //-V128
@@ -127,7 +127,7 @@ namespace hpx { namespace serialization
     }
 
     template <typename T, typename Allocator>
-    void serialize(output_archive & ar, std::vector<T, Allocator> & v, unsigned)
+    void serialize(output_archive & ar, const std::vector<T, Allocator> & v, unsigned)
     {
         ar << v.size(); //-V128
         if(v.empty()) return;

From de3612889bbac5fb9abcde71c07a34ba5457556c Mon Sep 17 00:00:00 2001
From: AntonBikineev <ant.bikineev@gmail.com>
Date: Fri, 18 Sep 2015 09:13:12 -0500
Subject: [PATCH 7/7] Adding line breaks after const-correctness change

---
 hpx/runtime/serialization/set.hpp    | 3 ++-
 hpx/runtime/serialization/vector.hpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hpx/runtime/serialization/set.hpp b/hpx/runtime/serialization/set.hpp
index 32cd95deef06..59d11e802562 100644
--- a/hpx/runtime/serialization/set.hpp
+++ b/hpx/runtime/serialization/set.hpp
@@ -27,7 +27,8 @@ namespace hpx { namespace serialization
     }
 
     template <class T, class Compare, class Allocator>
-    void serialize(output_archive & ar, const std::set<T, Compare, Allocator> & set, unsigned)
+    void serialize(output_archive & ar,const std::set<T, Compare, Allocator> & set,
+        unsigned)
     {
         boost::uint64_t size = set.size();
         ar << size;
diff --git a/hpx/runtime/serialization/vector.hpp b/hpx/runtime/serialization/vector.hpp
index 847182529f37..8e4c6e201854 100644
--- a/hpx/runtime/serialization/vector.hpp
+++ b/hpx/runtime/serialization/vector.hpp
@@ -98,7 +98,8 @@ namespace hpx { namespace serialization
     }
 
     template <typename T, typename Allocator>
-    void save_impl(output_archive & ar, const std::vector<T, Allocator> & v, boost::mpl::true_)
+    void save_impl(output_archive & ar, const std::vector<T, Allocator> & v,
+        boost::mpl::true_)
     {
         if(!has_array_optimization(ar))
         {