boost/mpi
2
0
Fork 0
mirror of https://github.com/boostorg/mpi.git synced 2026-02-26 16:52:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from boostorg/develop

Browse Source 
Small fixes merge
This commit is contained in:
Alain Miniussi
2015-09-22 00:19:27 +02:00
parent 772337fa47 9ca5dd26d7
commit c85ec97d9c
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/mpi/collectives/reduce.hpp
View File

@@ -46,7 +46,7 @@ namespace detail {
template<typename T, typename Op>
void
reduce_impl(const communicator& comm, const T* in_values, int n,
T* out_values, Op op, int root, mpl::true_ /*is_mpi_op*/,
T* out_values, Op /*op*/, int root, mpl::true_ /*is_mpi_op*/,
mpl::true_/*is_mpi_datatype*/)
{
BOOST_MPI_CHECK_RESULT(MPI_Reduce,
@@ -59,7 +59,7 @@ namespace detail {
// datatype and operation, so we'll use MPI_Reduce directly.
template<typename T, typename Op>
void
reduce_impl(const communicator& comm, const T* in_values, int n, Op op,
reduce_impl(const communicator& comm, const T* in_values, int n, Op /*op*/,
int root, mpl::true_ /*is_mpi_op*/, mpl::true_/*is_mpi_datatype*/)
{
BOOST_MPI_CHECK_RESULT(MPI_Reduce,

2
include/boost/mpi/collectives/scan.hpp
View File

@@ -47,7 +47,7 @@ namespace detail {
template<typename T, typename Op>
void
scan_impl(const communicator& comm, const T* in_values, int n, T* out_values,
Op op, mpl::true_ /*is_mpi_op*/, mpl::true_ /*is_mpi_datatype*/)
Op /*op*/, mpl::true_ /*is_mpi_op*/, mpl::true_ /*is_mpi_datatype*/)
{
BOOST_MPI_CHECK_RESULT(MPI_Scan,
(const_cast<T*>(in_values), out_values, n,

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

@@ -61,10 +61,10 @@ BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::tracking_type)
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::class_name_type)
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(serialization::collection_size_type)
void load_override(std::string & s , int)
void load_override(std::string & s)
{
serialization::collection_size_type length(s.size());
load_override(length,0);
load_override(length);
s.resize(length);
}

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

@@ -61,9 +61,9 @@ BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::tracking_type)
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::class_name_type)
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(serialization::collection_size_type)
void save_override(std::string const & t , int)
void save_override(std::string const & t)
{
save_override(serialization::collection_size_type(t.size()),0);
save_override(serialization::collection_size_type(t.size()));
}

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

@@ -58,10 +58,10 @@ BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::class_name_type)
BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(serialization::collection_size_type)
BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(serialization::item_version_type)
void save_override(std::string const & s, int)
void save_override(std::string const & s)
{
if (s.size())
save_override(serialization::make_array(s.data(),s.size()),0);
save_override(serialization::make_array(s.data(),s.size()));
}
#undef BOOST_ARCHIVE_IGNORE_IMPLEMENTATION