From ff43b17a254c075f487183a4a87e589aedca2125 Mon Sep 17 00:00:00 2001
From: Sylwester Arabas <sylwester.arabas@uj.edu.pl>
Date: Sun, 24 May 2020 18:04:17 +0200
Subject: [PATCH] see https://github.com/blitzpp/blitz/pull/34

---
 blitz/memblock.h | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/blitz/memblock.h b/blitz/memblock.h
index f54ef100..f1f4ecdf 100644
--- a/blitz/memblock.h
+++ b/blitz/memblock.h
@@ -35,12 +35,17 @@
 #include <blitz/blitz.h>
 #include <blitz/simdtypes.h>
 #ifdef BZ_HAVE_BOOST_SERIALIZATION
-#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/split_member.hpp>
-#include <boost/serialization/array.hpp>
-#include <boost/serialization/collection_size_type.hpp>
-#include <boost/serialization/nvp.hpp>
+#  include <boost/serialization/serialization.hpp>
+#  include <boost/serialization/base_object.hpp>
+#  include <boost/serialization/split_member.hpp>
+#  include <boost/serialization/array.hpp>
+#  include <boost/serialization/collection_size_type.hpp>
+#  include <boost/serialization/nvp.hpp>
+#  include <boost/version.hpp>
+#  if BOOST_VERSION >= 106000
+#    include <boost/serialization/array_wrapper.hpp>
+#    include <boost/archive/detail/iserializer.hpp>
+#  endif
 #endif
 #include <stddef.h>     // diffType
 
@@ -79,6 +84,12 @@ class MemoryBlock {
     typedef P_type T_type;
 
 protected:
+#ifdef BZ_HAVE_BOOST_SERIALIZATION
+#  if BOOST_VERSION >= 106000
+    friend class boost::serialization::access ;
+    template<class T> friend class boost::archive::detail::heap_allocation;
+#  endif
+#endif
     explicit MemoryBlock(sizeType items)
     {
       // pad the length to vecWidth, if not already done