From 951e2b00dc085ce57074dfc246f042beb2910299 Mon Sep 17 00:00:00 2001 From: Alain Miniussi Date: Mon, 1 Sep 2014 15:41:23 +0200 Subject: [PATCH] Only define BOOST_COMPILE if not already done (as it is already the case for g++ and ms). Usfull when called through nvcc. fixes #10420 --- include/boost/config/compiler/intel.hpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp index b28fef47..92dc4a34 100644 --- a/include/boost/config/compiler/intel.hpp +++ b/include/boost/config/compiler/intel.hpp @@ -34,11 +34,14 @@ # define BOOST_INTEL_STDCXX0X #endif -#ifdef BOOST_INTEL_STDCXX0X -#define BOOST_COMPILER "Intel C++ C++0x mode version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION) -#else -#define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION) +#if !defined(BOOST_COMPILER) +# if defined(BOOST_INTEL_STDCXX0X) +# define BOOST_COMPILER "Intel C++ C++0x mode version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION) +# else +# define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION) +# endif #endif + #define BOOST_INTEL BOOST_INTEL_CXX_VERSION #if defined(_WIN32) || defined(_WIN64)