[Boost-commit] svn:boost r44412 - trunk/boost/mpi

From: dgregor_at_[hidden]
Date: 2008-04-14 09:51:19

Author: dgregor
Date: 2008-04-14 09:51:18 EDT (Mon, 14 Apr 2008)
New Revision: 44412
URL: http://svn.boost.org/trac/boost/changeset/44412

Log:
Define is_mpi_datatype appropriately for wchar_t and long long/int64 types
Text files modified: 
   trunk/boost/mpi/datatype.hpp |    33 +++++++++++++++++++++++----------       
   1 files changed, 23 insertions(+), 10 deletions(-)

Modified: trunk/boost/mpi/datatype.hpp
==============================================================================
--- trunk/boost/mpi/datatype.hpp	(original)
+++ trunk/boost/mpi/datatype.hpp	2008-04-14 09:51:18 EDT (Mon, 14 Apr 2008)
@@ -263,25 +263,38 @@
 {
 };
 
-
-#if 0
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
+// Define wchar_t specialization of is_mpi_datatype, if possible.
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T) && \
+  (defined(MPI_WCHAR) || (defined(MPI_VERSION) && MPI_VERSION >= 2))
 BOOST_MPI_DATATYPE(wchar_t, MPI_WCHAR, builtin);
 #endif
 
-#ifdef BOOST_HAS_LONG_LONG
+// Define long long or __int64 specialization of is_mpi_datatype, if possible.
+#if defined(BOOST_HAS_LONG_LONG) && \
+  (defined(MPI_LONG_LONG_INT) || (defined(MPI_VERSION) && MPI_VERSION >= 2))
 BOOST_MPI_DATATYPE(long long, MPI_LONG_LONG_INT, builtin);
-BOOST_MPI_DATATYPE(unsigned long long, MPI_UNSIGNED_LONG_LONG, builtin);
-#endif
+#elif defined(BOOST_HAS_MS_INT64) && \
+  (defined(MPI_LONG_LONG_INT) || (defined(MPI_VERSION) && MPI_VERSION >= 2))
+BOOST_MPI_DATATYPE(__int64, MPI_LONG_LONG_INT, builtin); 
 #endif
 
-#endif // Doxygen
-
-#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)
-BOOST_MPI_DATATYPE(__int64, MPI_LONG_LONG_INT, builtin); 
+// Define unsigned long long or unsigned __int64 specialization of
+// is_mpi_datatype, if possible. We separate this from the check for
+// the (signed) long long/__int64 because some MPI implementations
+// (e.g., MPICH-MX) have MPI_LONG_LONG_INT but not
+// MPI_UNSIGNED_LONG_LONG.
+#if defined(BOOST_HAS_LONG_LONG) && \
+  (defined(MPI_UNSIGNED_LONG_LONG) \
+   || (defined(MPI_VERSION) && MPI_VERSION >= 2))
+BOOST_MPI_DATATYPE(unsigned long long, MPI_UNSIGNED_LONG_LONG, builtin);
+#elif defined(BOOST_HAS_MS_INT64) && \
+  (defined(MPI_UNSIGNED_LONG_LONG) \
+   || (defined(MPI_VERSION) && MPI_VERSION >= 2))
 BOOST_MPI_DATATYPE(unsigned __int64, MPI_UNSIGNED_LONG_LONG, builtin); 
 #endif
 
+#endif // Doxygen
+
 namespace detail {
   inline MPI_Datatype build_mpi_datatype_for_bool()
   {