|
|
Boost-Commit : |
From: troyer_at_[hidden]
Date: 2008-06-26 07:12:45
Author: troyer
Date: 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
New Revision: 46710
URL: http://svn.boost.org/trac/boost/changeset/46710
Log:
Fixed tabs
Text files modified:
trunk/boost/mpi/communicator.hpp | 18 +++++++++---------
trunk/boost/mpi/detail/forward_iprimitive.hpp | 26 +++++++++++++-------------
trunk/boost/mpi/detail/forward_oprimitive.hpp | 26 +++++++++++++-------------
trunk/boost/mpi/detail/forward_skeleton_iarchive.hpp | 20 ++++++++++----------
trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp | 20 ++++++++++----------
trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp | 13 ++++++-------
trunk/boost/mpi/detail/mpi_datatype_cache.hpp | 8 ++++----
trunk/boost/mpi/detail/text_skeleton_oarchive.hpp | 4 ++--
trunk/libs/mpi/src/mpi_datatype_cache.cpp | 35 +++++++++++++++++------------------
trunk/libs/mpi/src/point_to_point.cpp | 2 +-
10 files changed, 85 insertions(+), 87 deletions(-)
Modified: trunk/boost/mpi/communicator.hpp
==============================================================================
--- trunk/boost/mpi/communicator.hpp (original)
+++ trunk/boost/mpi/communicator.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -1141,7 +1141,7 @@
{
BOOST_MPI_CHECK_RESULT(MPI_Send,
(const_cast<T*>(values), n,
- get_mpi_datatype<T>(*values),
+ get_mpi_datatype<T>(*values),
dest, tag, MPI_Comm(*this)));
}
@@ -1174,7 +1174,7 @@
BOOST_MPI_CHECK_RESULT(MPI_Recv,
(const_cast<T*>(&value), 1,
- get_mpi_datatype<T>(value),
+ get_mpi_datatype<T>(value),
source, tag, MPI_Comm(*this), &stat.m_status));
return stat;
}
@@ -1209,7 +1209,7 @@
status stat;
BOOST_MPI_CHECK_RESULT(MPI_Recv,
(const_cast<T*>(values), n,
- get_mpi_datatype<T>(*values),
+ get_mpi_datatype<T>(*values),
source, tag, MPI_Comm(*this), &stat.m_status));
return stat;
}
@@ -1256,7 +1256,7 @@
request req;
BOOST_MPI_CHECK_RESULT(MPI_Isend,
(const_cast<T*>(&value), 1,
- get_mpi_datatype<T>(value),
+ get_mpi_datatype<T>(value),
dest, tag, MPI_Comm(*this), &req.m_requests[0]));
return req;
}
@@ -1291,7 +1291,7 @@
request req;
BOOST_MPI_CHECK_RESULT(MPI_Isend,
(const_cast<T*>(values), n,
- get_mpi_datatype<T>(*values),
+ get_mpi_datatype<T>(*values),
dest, tag, MPI_Comm(*this), &req.m_requests[0]));
return req;
}
@@ -1531,7 +1531,7 @@
request req;
BOOST_MPI_CHECK_RESULT(MPI_Irecv,
(const_cast<T*>(&value), 1,
- get_mpi_datatype<T>(value),
+ get_mpi_datatype<T>(value),
source, tag, MPI_Comm(*this), &req.m_requests[0]));
return req;
}
@@ -1548,7 +1548,7 @@
BOOST_MPI_CHECK_RESULT(MPI_Irecv,
(&data->count, 1,
- get_mpi_datatype<std::size_t>(data->count),
+ get_mpi_datatype<std::size_t>(data->count),
source, tag, MPI_Comm(*this), &req.m_requests[0]));
return req;
@@ -1569,7 +1569,7 @@
request req;
BOOST_MPI_CHECK_RESULT(MPI_Irecv,
(const_cast<T*>(values), n,
- get_mpi_datatype<T>(*values),
+ get_mpi_datatype<T>(*values),
source, tag, MPI_Comm(*this), &req.m_requests[0]));
return req;
}
@@ -1587,7 +1587,7 @@
BOOST_MPI_CHECK_RESULT(MPI_Irecv,
(&data->count, 1,
- get_mpi_datatype<std::size_t>(data->count),
+ get_mpi_datatype<std::size_t>(data->count),
source, tag, MPI_Comm(*this), &req.m_requests[0]));
return req;
Modified: trunk/boost/mpi/detail/forward_iprimitive.hpp
==============================================================================
--- trunk/boost/mpi/detail/forward_iprimitive.hpp (original)
+++ trunk/boost/mpi/detail/forward_iprimitive.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -28,26 +28,26 @@
/// the type of the archive to which the loading of primitive types will be forwarded
typedef ImplementationArchive implementation_archive_type;
-
- /// the constructor takes a reference to the implementation archive used for loading primitve types
+
+ /// the constructor takes a reference to the implementation archive used for loading primitve types
forward_iprimitive(implementation_archive_type& ar)
- : implementation_archive(ar)
+ : implementation_archive(ar)
{}
- /// binary loading is forwarded to the implementation archive
+ /// binary loading is forwarded to the implementation archive
void load_binary(void * address, std::size_t count )
- {
- implementation_archive.load_binary(address,count);
- }
-
- /// loading of arrays is forwarded to the implementation archive
+ {
+ implementation_archive.load_binary(address,count);
+ }
+
+ /// loading of arrays is forwarded to the implementation archive
template<class T>
void load_array(serialization::array<T> & x, unsigned int file_version )
{
- implementation_archive.load_array(x,file_version);
+ implementation_archive.load_array(x,file_version);
}
- typedef typename ImplementationArchive::use_array_optimization use_array_optimization;
+ typedef typename ImplementationArchive::use_array_optimization use_array_optimization;
#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
friend class archive::load_access;
@@ -60,9 +60,9 @@
template<class T>
void load(T & t)
{
- implementation_archive >> t;
+ implementation_archive >> t;
}
-
+
private:
implementation_archive_type& implementation_archive;
};
Modified: trunk/boost/mpi/detail/forward_oprimitive.hpp
==============================================================================
--- trunk/boost/mpi/detail/forward_oprimitive.hpp (original)
+++ trunk/boost/mpi/detail/forward_oprimitive.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -29,26 +29,26 @@
/// the type of the archive to which the saving of primitive types will be forwarded
typedef ImplementationArchive implementation_archive_type;
-
- /// the constructor takes a reference to the implementation archive used for saving primitve types
+
+ /// the constructor takes a reference to the implementation archive used for saving primitve types
forward_oprimitive(implementation_archive_type& ar)
- : implementation_archive(ar)
+ : implementation_archive(ar)
{}
- /// binary saving is forwarded to the implementation archive
+ /// binary saving is forwarded to the implementation archive
void save_binary(const void * address, std::size_t count)
- {
- implementation_archive.save_binary(address,count);
- }
-
- /// saving of arrays is forwarded to the implementation archive
+ {
+ implementation_archive.save_binary(address,count);
+ }
+
+ /// saving of arrays is forwarded to the implementation archive
template<class T>
void save_array(serialization::array<T> const& x, unsigned int file_version )
{
- implementation_archive.save_array(x,file_version);
+ implementation_archive.save_array(x,file_version);
}
- typedef typename ImplementationArchive::use_array_optimization use_array_optimization;
+ typedef typename ImplementationArchive::use_array_optimization use_array_optimization;
#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
friend class archive::save_access;
@@ -61,9 +61,9 @@
template<class T>
void save(const T & t)
{
- implementation_archive << t;
+ implementation_archive << t;
}
-
+
private:
implementation_archive_type& implementation_archive;
};
Modified: trunk/boost/mpi/detail/forward_skeleton_iarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/forward_skeleton_iarchive.hpp (original)
+++ trunk/boost/mpi/detail/forward_skeleton_iarchive.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -26,13 +26,13 @@
public:
typedef ImplementationArchive implementation_archive_type;
-
+
forward_skeleton_iarchive(implementation_archive_type& ar)
- : archive::detail::common_iarchive<Archive>(archive::no_header),
- implementation_archive(ar)
- {
- }
-
+ : archive::detail::common_iarchive<Archive>(archive::no_header),
+ implementation_archive(ar)
+ {
+ }
+
#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
public:
#else
@@ -49,12 +49,12 @@
{
archive::load(* this->This(), t);
}
-
+
#define BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(T) \
void load_override(T & t , int) \
- { \
- implementation_archive >> t; \
- }
+ { \
+ implementation_archive >> t; \
+ }
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::class_id_optional_type)
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::version_type)
Modified: trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp (original)
+++ trunk/boost/mpi/detail/forward_skeleton_oarchive.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -26,13 +26,13 @@
public:
typedef ImplementationArchive implementation_archive_type;
-
+
forward_skeleton_oarchive(implementation_archive_type& ar)
- : archive::detail::common_oarchive<Archive>(archive::no_header),
- implementation_archive(ar)
- {
- }
-
+ : archive::detail::common_oarchive<Archive>(archive::no_header),
+ implementation_archive(ar)
+ {
+ }
+
#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
public:
#else
@@ -49,12 +49,12 @@
{
archive::save(* this->This(), t);
}
-
+
#define BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(T) \
void save_override(T const & t , int) \
- { \
- implementation_archive << t; \
- }
+ { \
+ implementation_archive << t; \
+ }
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::class_id_optional_type)
BOOST_ARCHIVE_FORWARD_IMPLEMENTATION(archive::version_type)
Modified: trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp (original)
+++ trunk/boost/mpi/detail/ignore_skeleton_oarchive.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -24,12 +24,11 @@
: public archive::detail::common_oarchive<Archive>
{
public:
-
ignore_skeleton_oarchive()
- : archive::detail::common_oarchive<Archive>(archive::no_header)
- {
- }
-
+ : archive::detail::common_oarchive<Archive>(archive::no_header)
+ {
+ }
+
#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
public:
#else
@@ -46,10 +45,10 @@
{
archive::save(* this->This(), t);
}
-
+
#define BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(T) \
void save_override(T const & , int) \
- {}
+ {}
BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::class_id_optional_type)
BOOST_ARCHIVE_IGNORE_IMPLEMENTATION(archive::version_type)
Modified: trunk/boost/mpi/detail/mpi_datatype_cache.hpp
==============================================================================
--- trunk/boost/mpi/detail/mpi_datatype_cache.hpp (original)
+++ trunk/boost/mpi/detail/mpi_datatype_cache.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -69,12 +69,12 @@
// check whether the type already exists
std::type_info const* t = &typeid(T);
- MPI_Datatype datatype = get(t);
- if (datatype == MPI_DATATYPE_NULL) {
+ MPI_Datatype datatype = get(t);
+ if (datatype == MPI_DATATYPE_NULL) {
// need to create a type
mpi_datatype_oarchive ar(x);
- datatype = ar.get_mpi_datatype();
- set(t, datatype);
+ datatype = ar.get_mpi_datatype();
+ set(t, datatype);
}
return datatype;
Modified: trunk/boost/mpi/detail/text_skeleton_oarchive.hpp
==============================================================================
--- trunk/boost/mpi/detail/text_skeleton_oarchive.hpp (original)
+++ trunk/boost/mpi/detail/text_skeleton_oarchive.hpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -24,9 +24,9 @@
{
public:
text_skeleton_oarchive(std::ostream & s, unsigned int flags = 0)
- : detail::forward_skeleton_oarchive<text_skeleton_oarchive,boost::archive::text_oarchive>(skeleton_archive_)
+ : detail::forward_skeleton_oarchive<text_skeleton_oarchive,boost::archive::text_oarchive>(skeleton_archive_)
, skeleton_archive_(s,flags)
- {}
+ {}
private:
boost::archive::text_oarchive skeleton_archive_;
Modified: trunk/libs/mpi/src/mpi_datatype_cache.cpp
==============================================================================
--- trunk/libs/mpi/src/mpi_datatype_cache.cpp (original)
+++ trunk/libs/mpi/src/mpi_datatype_cache.cpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -13,16 +13,16 @@
namespace boost { namespace mpi { namespace detail {
typedef std::map<std::type_info const*,MPI_Datatype,type_info_compare>
- stored_map_type;
+ stored_map_type;
struct mpi_datatype_map::implementation
{
- stored_map_type map;
+ stored_map_type map;
};
mpi_datatype_map::mpi_datatype_map()
{
- impl = new implementation();
+ impl = new implementation();
}
mpi_datatype_map::~mpi_datatype_map()
@@ -30,32 +30,31 @@
// do not free after call to MPI_FInalize
int finalized=0;
BOOST_MPI_CHECK_RESULT(MPI_Finalized,(&finalized));
- if (!finalized) {
- // ignore errors in the destructor
- for (stored_map_type::iterator it=impl->map.begin(); it != impl->map.end(); ++it) {
- MPI_Type_free(&(it->second));
- }
- }
- delete impl;
+ if (!finalized) {
+ // ignore errors in the destructor
+ for (stored_map_type::iterator it=impl->map.begin(); it != impl->map.end(); ++it)
+ MPI_Type_free(&(it->second));
+ }
+ delete impl;
}
MPI_Datatype mpi_datatype_map::get(const std::type_info* t)
{
- stored_map_type::iterator pos = impl->map.find(t);
- if (pos != impl->map.end())
- return pos->second;
- else
- return MPI_DATATYPE_NULL;
+ stored_map_type::iterator pos = impl->map.find(t);
+ if (pos != impl->map.end())
+ return pos->second;
+ else
+ return MPI_DATATYPE_NULL;
}
void mpi_datatype_map::set(const std::type_info* t, MPI_Datatype datatype)
{
- impl->map[t] = datatype;
+ impl->map[t] = datatype;
}
mpi_datatype_map& mpi_datatype_cache()
{
- static mpi_datatype_map cache;
- return cache;
+ static mpi_datatype_map cache;
+ return cache;
}
} } }
Modified: trunk/libs/mpi/src/point_to_point.cpp
==============================================================================
--- trunk/libs/mpi/src/point_to_point.cpp (original)
+++ trunk/libs/mpi/src/point_to_point.cpp 2008-06-26 07:12:44 EDT (Thu, 26 Jun 2008)
@@ -32,7 +32,7 @@
BOOST_MPI_CHECK_RESULT(MPI_Send,
(const_cast<void*>(size), 1,
get_mpi_datatype<std::size_t>(ar.size()),
- dest, tag, comm));
+ dest, tag, comm));
BOOST_MPI_CHECK_RESULT(MPI_Send,
(const_cast<void*>(ar.address()), ar.size(),
MPI_PACKED,
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk