boost-1.61.patch

   1 --- Collage-1.4.0/co/dataIStreamArchive.h~      2016-05-28 17:25:24.000000000 +0000
   2 +++ Collage-1.4.0/co/dataIStreamArchive.h       2016-05-28 17:28:01.400951002 +0000
   3 @@ -42,6 +42,7 @@
   4  #  include <boost/archive/shared_ptr_helper.hpp>
   5  #endif
   6  #include <boost/serialization/is_bitwise_serializable.hpp>
   7 +#include <boost/serialization/array.hpp>
   8
   9  #include <boost/spirit/home/support/detail/endian.hpp>
  10  #include <boost/spirit/home/support/detail/math/fpclassify.hpp>
  11 @@ -73,7 +72,7 @@
  12
  13      /** @internal use optimized load for arrays. */
  14      template< typename T >
  15 -    void load_array( boost::serialization::array< T >& a, unsigned int );
  16 +    void load_array( boost::serialization::array_wrapper< T >& a, unsigned int );
  17
  18      /** @internal enable serialization optimization for arrays. */
  19      struct use_array_optimization
  20 --- Collage-1.4.0/co/dataIStreamArchive.ipp~    2016-03-21 10:09:25.000000000 +0000
  21 +++ Collage-1.4.0/co/dataIStreamArchive.ipp     2016-05-28 17:28:34.587798794 +0000
  22 @@ -22,7 +22,7 @@
  23  {
  24
  25  template< typename T >
  26 -void DataIStreamArchive::load_array( boost::serialization::array< T >& a,
  27 +void DataIStreamArchive::load_array( boost::serialization::array_wrapper< T >& a,
  28                                       unsigned int )
  29  {
  30      _stream >> Array< T >( a.address(), a.count( ));
  31 --- Collage-1.4.0/co/dataOStreamArchive.h~      2016-03-21 10:09:25.000000000 +0000
  32 +++ Collage-1.4.0/co/dataOStreamArchive.h       2016-05-28 17:28:51.074554669 +0000
  33 @@ -49,6 +49,7 @@
  34  #include <boost/type_traits/is_signed.hpp>
  35  #include <boost/type_traits/is_floating_point.hpp>
  36
  37 +#include <boost/serialization/array.hpp>
  38
  39  namespace co
  40  {
  41 @@ -68,7 +68,7 @@
  42
  43      /** @internal use optimized save for arrays. */
  44      template< typename T >
  45 -    void save_array( const boost::serialization::array< T >& a, unsigned int );
  46 +    void save_array( const boost::serialization::array_wrapper< T >& a, unsigned int );
  47
  48      /** @internal enable serialization optimization for arrays. */
  49      struct use_array_optimization
  50 --- Collage-1.4.0/co/dataOStreamArchive.ipp~    2016-03-21 10:09:25.000000000 +0000
  51 +++ Collage-1.4.0/co/dataOStreamArchive.ipp     2016-05-28 17:29:05.451298725 +0000
  52 @@ -17,7 +17,7 @@
  53
  54
  55  template< typename T >
  56 -void DataOStreamArchive::save_array( const boost::serialization::array< T >& a,
  57 +void DataOStreamArchive::save_array( const boost::serialization::array_wrapper< T >& a,
  58                                       unsigned int )
  59  {
  60      _stream << Array< const T >( a.address(), a.count( ));