feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Merge pull request #38 from aminiussi/cudaintel

Browse Source 
Only define BOOST_COMPILER if not already done
This commit is contained in:
Edward Diener
2014-09-01 17:15:04 -04:00
parent 2690cb8b39 951e2b00dc
commit 7a7a7077b6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/config/compiler/intel.hpp
View File

@ -34,11 +34,14 @@
# define BOOST_INTEL_STDCXX0X # define BOOST_INTEL_STDCXX0X
#endif #endif
#ifdef BOOST_INTEL_STDCXX0X #if !defined(BOOST_COMPILER)
#define BOOST_COMPILER "Intel C++ C++0x mode version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION) # if defined(BOOST_INTEL_STDCXX0X)
#else # define BOOST_COMPILER "Intel C++ C++0x mode version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
#define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION) # else
# define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
# endif
#endif #endif
#define BOOST_INTEL BOOST_INTEL_CXX_VERSION #define BOOST_INTEL BOOST_INTEL_CXX_VERSION
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)