1
1

Fix C++11 issue identified by Jeremiah Willcock

(http://www.open-mpi.org/community/lists/users/2013/11/22912.php).

cmr=v1.7.4:reviewer=brbarret

This commit was SVN r29608.
Этот коммит содержится в:
Jeff Squyres 2013-11-05 19:48:03 +00:00
родитель e46c0bb952
Коммит b71bd51cdd

Просмотреть файл

@ -98,7 +98,7 @@
# define PLATFORM_COMPILER_VERSION \ # define PLATFORM_COMPILER_VERSION \
PLATFORM_COMPILER_VERSION_INT(__INTEL_COMPILER/10, __INTEL_COMPILER/100, _PLATFORM_INTEL_COMPILER_BUILD_DATE) PLATFORM_COMPILER_VERSION_INT(__INTEL_COMPILER/10, __INTEL_COMPILER/100, _PLATFORM_INTEL_COMPILER_BUILD_DATE)
# define PLATFORM_COMPILER_VERSION_STR \ # define PLATFORM_COMPILER_VERSION_STR \
_STRINGIFY(__INTEL_COMPILER)"."_STRINGIFY(_PLATFORM_INTEL_COMPILER_BUILD_DATE) _STRINGIFY(__INTEL_COMPILER) "." _STRINGIFY(_PLATFORM_INTEL_COMPILER_BUILD_DATE)
#elif defined(__PATHSCALE__) #elif defined(__PATHSCALE__)
# define PLATFORM_COMPILER_PATHSCALE 1 # define PLATFORM_COMPILER_PATHSCALE 1
@ -131,7 +131,7 @@
# define PLATFORM_COMPILER_VERSION \ # define PLATFORM_COMPILER_VERSION \
PLATFORM_COMPILER_VERSION_INT(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__) PLATFORM_COMPILER_VERSION_INT(__PGIC__,__PGIC_MINOR__,__PGIC_PATCHLEVEL__)
# define PLATFORM_COMPILER_VERSION_STR \ # define PLATFORM_COMPILER_VERSION_STR \
_STRINGIFY(__PGIC__)"."_STRINGIFY(__PGIC_MINOR__)"-"_STRINGIFY(__PGIC_PATCHLEVEL__) _STRINGIFY(__PGIC__) "." _STRINGIFY(__PGIC_MINOR__) "-" _STRINGIFY(__PGIC_PATCHLEVEL__)
# else # else
/* PGI before 6.1-4 lacks any version ID preprocessor macros - so use this filthy hack */ /* PGI before 6.1-4 lacks any version ID preprocessor macros - so use this filthy hack */
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@ -370,13 +370,13 @@
/* gather any advertised GNU version number info, even for non-gcc compilers */ /* gather any advertised GNU version number info, even for non-gcc compilers */
# if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__) # if defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
# define __PLATFORM_COMPILER_GNU_VERSION_STR \ # define __PLATFORM_COMPILER_GNU_VERSION_STR \
_STRINGIFY(__GNUC__)"."_STRINGIFY(__GNUC_MINOR__)"."_STRINGIFY(__GNUC_PATCHLEVEL__) _STRINGIFY(__GNUC__) "." _STRINGIFY(__GNUC_MINOR__) "." _STRINGIFY(__GNUC_PATCHLEVEL__)
# elif defined(__GNUC_MINOR__) # elif defined(__GNUC_MINOR__)
# define __PLATFORM_COMPILER_GNU_VERSION_STR \ # define __PLATFORM_COMPILER_GNU_VERSION_STR \
_STRINGIFY(__GNUC__)"."_STRINGIFY(__GNUC_MINOR__)".?" _STRINGIFY(__GNUC__) "." _STRINGIFY(__GNUC_MINOR__) ".?"
# else # else
# define __PLATFORM_COMPILER_GNU_VERSION_STR \ # define __PLATFORM_COMPILER_GNU_VERSION_STR \
_STRINGIFY(__GNUC__)".?.?" _STRINGIFY(__GNUC__) ".?.?"
# endif # endif
#elif defined(PLATFORM_COMPILER_UNKNOWN) /* unknown compiler */ #elif defined(PLATFORM_COMPILER_UNKNOWN) /* unknown compiler */
# define PLATFORM_COMPILER_FAMILYNAME UNKNOWN # define PLATFORM_COMPILER_FAMILYNAME UNKNOWN