boost/mpi
2
0
Fork 0
mirror of https://github.com/boostorg/mpi.git synced 2026-02-25 04:22:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix: adapt to renaming of serialization::array_wrapper (#30)

Browse Source 
Fix: adapt to renaming of serialization::array_wrapper

Tested that both graph_parallel and MPI work fine with El Capitan and clang, thanks for the patch!
This commit is contained in:
Jürgen Hunold
2016-04-24 21:59:36 +02:00
committed by K. Noel Belcourt
parent c85ec97d9c
commit 0dce8d2c2a
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/mpi/communicator.hpp
View File

@@ -1257,7 +1257,7 @@ communicator::array_recv_impl(int source, int tag, T* values, int n,
ia >> count;
// Deserialize the data in the message
boost::serialization::array<T> arr(values, count > n? n : count);
boost::serialization::array_wrapper<T> arr(values, count > n? n : count);
ia >> arr;
if (count > n) {
@@ -1459,7 +1459,7 @@ namespace detail {
ia >> count;
// Deserialize the data in the message
boost::serialization::array<T> arr(values, count > n? n : count);
boost::serialization::array_wrapper<T> arr(values, count > n? n : count);
ia >> arr;
if (count > n) {

4
include/boost/mpi/detail/binary_buffer_iprimitive.hpp
View File

@@ -66,7 +66,7 @@ public:
// fast saving of arrays of fundamental types
template<class T>
void load_array(serialization::array<T> const& x, unsigned int /* file_version */)
void load_array(serialization::array_wrapper<T> const& x, unsigned int /* file_version */)
{
BOOST_MPL_ASSERT((serialization::is_bitwise_serializable<BOOST_DEDUCED_TYPENAME remove_const<T>::type>));
if (x.count())
@@ -76,7 +76,7 @@ public:
typedef serialization::is_bitwise_serializable<mpl::_1> use_array_optimization;
template<class T>
void load(serialization::array<T> const& x)
void load(serialization::array_wrapper<T> const& x)
{
load_array(x,0u);
}

4
include/boost/mpi/detail/binary_buffer_oprimitive.hpp
View File

@@ -55,7 +55,7 @@ public:
// fast saving of arrays
template<class T>
void save_array(serialization::array<T> const& x, unsigned int /* file_version */)
void save_array(serialization::array_wrapper<T> const& x, unsigned int /* file_version */)
{
BOOST_MPL_ASSERT((serialization::is_bitwise_serializable<BOOST_DEDUCED_TYPENAME remove_const<T>::type>));
@@ -64,7 +64,7 @@ public:
}
template<class T>
void save(serialization::array<T> const& x)
void save(serialization::array_wrapper<T> const& x)
{
save_array(x,0u);
}

2
include/boost/mpi/detail/forward_iprimitive.hpp
View File

@@ -42,7 +42,7 @@ public:
/// loading of arrays is forwarded to the implementation archive
template<class T>
void load_array(serialization::array<T> & x, unsigned int file_version )
void load_array(serialization::array_wrappe<T> & x, unsigned int file_version )
{
implementation_archive.load_array(x,file_version);
}

2
include/boost/mpi/detail/forward_oprimitive.hpp
View File

@@ -43,7 +43,7 @@ public:
/// saving of arrays is forwarded to the implementation archive
template<class T>
void save_array(serialization::array<T> const& x, unsigned int file_version )
void save_array(serialization::array_wrapper<T> const& x, unsigned int file_version )
{
implementation_archive.save_array(x,file_version);
}

2
include/boost/mpi/detail/ignore_iprimitive.hpp
View File

@@ -37,7 +37,7 @@ public:
/// don't do anything when loading arrays
template<class T>
void load_array(serialization::array<T> &, unsigned int )
void load_array(serialization::array_wrapper<T> &, unsigned int )
{}
typedef is_mpi_datatype<mpl::_1> use_array_optimization;

2
include/boost/mpi/detail/ignore_oprimitive.hpp
View File

@@ -36,7 +36,7 @@ public:
/// don't do anything when saving arrays
template<class T>
void save_array(serialization::array<T> const&, unsigned int )
void save_array(serialization::array_wrapper<T> const&, unsigned int )
{
}

2
include/boost/mpi/detail/mpi_datatype_primitive.hpp
View File

@@ -63,7 +63,7 @@ public:
// fast saving of arrays of MPI types
template<class T>
void save_array(serialization::array<T> const& x, unsigned int /* version */)
void save_array(serialization::array_wrapper<T> const& x, unsigned int /* version */)
{
if (x.count())
save_impl(x.address(), boost::mpi::get_mpi_datatype(*x.address()), x.count());

4
include/boost/mpi/detail/packed_iprimitive.hpp
View File

@@ -64,7 +64,7 @@ public:
// fast saving of arrays of fundamental types
template<class T>
void load_array(serialization::array<T> const& x, unsigned int /* file_version */)
void load_array(serialization::array_wrapper<T> const& x, unsigned int /* file_version */)
{
if (x.count())
load_impl(x.address(), get_mpi_datatype(*x.address()), x.count());
@@ -72,7 +72,7 @@ public:
/*
template<class T>
void load(serialization::array<T> const& x)
void load(serialization::array_wrapper<T> const& x)
{
load_array(x,0u);
}

2
include/boost/mpi/detail/packed_oprimitive.hpp
View File

@@ -54,7 +54,7 @@ public:
// fast saving of arrays
template<class T>
void save_array(serialization::array<T> const& x, unsigned int /* file_version */)
void save_array(serialization::array_wrapper<T> const& x, unsigned int /* file_version */)
{
if (x.count())
save_impl(x.address(), get_mpi_datatype(*x.address()), x.count());