diff options
Diffstat (limited to 'boost/mpi/config.hpp')
| -rw-r--r-- | boost/mpi/config.hpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/boost/mpi/config.hpp b/boost/mpi/config.hpp index cf08e2cdbe..acbdc78daa 100644 --- a/boost/mpi/config.hpp +++ b/boost/mpi/config.hpp @@ -27,7 +27,7 @@ // If this is an MPI-2 implementation, define configuration macros for // the features we are interested in. -#if defined(MPI_VERSION) && MPI_VERSION == 2 +#if defined(MPI_VERSION) && MPI_VERSION >= 2 /** @brief Determine if the MPI implementation has support for memory * allocation. * @@ -48,6 +48,11 @@ * environment class will provide a default constructor. This macro is * always defined for MPI-2 implementations. */ # define BOOST_MPI_HAS_NOARG_INITIALIZATION +#else +// If this is an MPI-1.x implementation, no arg initialization for +// mpi environement could still be available, but not mandatory. +// Undef this if no arg init is available: +//# define BOOST_MPI_HAS_NOARG_INITIALIZATION #endif #if defined(MPIAPI) @@ -80,12 +85,12 @@ * * *****************************************************************************/ -#if defined(BOOST_HAS_DECLSPEC) && (defined(BOOST_MPI_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_MPI_STATIC_LINK) +#if (defined(BOOST_MPI_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && !defined(BOOST_MPI_STATIC_LINK) # if defined(BOOST_MPI_SOURCE) -# define BOOST_MPI_DECL __declspec(dllexport) +# define BOOST_MPI_DECL BOOST_SYMBOL_EXPORT # define BOOST_MPI_BUILD_DLL # else -# define BOOST_MPI_DECL __declspec(dllimport) +# define BOOST_MPI_DECL BOOST_SYMBOL_IMPORT # endif #endif |