From b5446e9ad69cbf6d2c4465298c27f1523096faf9 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 24 Feb 2017 01:40:43 +0100 Subject: [PATCH] Fix bundled boost for Intel-17 --- .../boost-1.62.0/include/boost/serialization/array.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bundled/boost-1.62.0/include/boost/serialization/array.hpp b/bundled/boost-1.62.0/include/boost/serialization/array.hpp index 2cd023aca9..6904e07e6a 100644 --- a/bundled/boost-1.62.0/include/boost/serialization/array.hpp +++ b/bundled/boost-1.62.0/include/boost/serialization/array.hpp @@ -40,12 +40,12 @@ class array_wrapper : { private: array_wrapper & operator=(const array_wrapper & rhs); -public: + // taken from commit 6b33d1c in the boostorg/serialization repo // note: I would like to make the copy constructor private but this breaks - // make_array. So I try to make make_array a friend - but that doesn't - // build. Need a C++ guru to explain this! - template - friend const boost::serialization::array_wrapper make_array( T* t, S s); + // make_array. So I try to make make_array a friend + template + friend const boost::serialization::array_wrapper make_array(Tx * t, S s); +public: array_wrapper(const array_wrapper & rhs) : m_t(rhs.m_t), -- 2.39.5