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

Add a new config macro BOOST_INTEL

Browse Source 
[SVN r18504]
This commit is contained in:
Guillaume Melquiond
2003-05-23 07:03:21 +00:00
parent 269e334a5f
commit d1f3f6f38e
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.htm
View File

@ -1169,6 +1169,12 @@ user code.</p>
Microsoft Visual C++, as opposed to one of the many other Microsoft Visual C++, as opposed to one of the many other
compilers that also define _MSC_VER.</td> compilers that also define _MSC_VER.</td>
</tr> </tr>
<tr>
<td valign="top">BOOST_INTEL</td>
<td valign="top">&lt;boost/config.hpp&gt;</td>
<td valign="top">Defined if the compiler is an Intel compiler,
takes the same value as the compiler version macro.</td>
</tr>
<tr> <tr>
<td>BOOST_DINKUMWARE_STDLIB</td> <td>BOOST_DINKUMWARE_STDLIB</td>
<td>&lt;boost/config.hpp&gt;</td> <td>&lt;boost/config.hpp&gt;</td>

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

@ -9,14 +9,19 @@
#include "boost/config/compiler/common_edg.hpp" #include "boost/config/compiler/common_edg.hpp"
#ifdef __ICL #if defined(__INTEL_COMPILER)
# define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(__ICL) # define BOOST_INTEL_CXX_VERSION __INTEL_COMPILER
#elif defined(__ICL)
# define BOOST_INTEL_CXX_VERSION __ICL # define BOOST_INTEL_CXX_VERSION __ICL
#else #elif defined(__ICC)
# define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(__ICC)
# define BOOST_INTEL_CXX_VERSION __ICC # define BOOST_INTEL_CXX_VERSION __ICC
#elif defined(__ECC)
# define BOOST_INTEL_CXX_VERSION __ECC
#endif #endif
#define BOOST_COMPILER "Intel C++ version " BOOST_STRINGIZE(BOOST_INTEL_CXX_VERSION)
#define BOOST_INTEL BOOST_INTEL_CXX_VERSION
#if (BOOST_INTEL_CXX_VERSION <= 500) && defined(_MSC_VER) #if (BOOST_INTEL_CXX_VERSION <= 500) && defined(_MSC_VER)
# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS # define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
# define BOOST_NO_TEMPLATE_TEMPLATES # define BOOST_NO_TEMPLATE_TEMPLATES

2
include/boost/config/select_compiler_config.hpp
View File

@ -38,7 +38,7 @@
// Borland // Borland
# define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"
#elif defined(__ICL) || defined(__ICC) #elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
// Intel // Intel
# define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"

2
test/config_info.cpp
View File

@ -260,6 +260,7 @@ void print_compiler_macros()
// misc compilers not covered so far: // misc compilers not covered so far:
PRINT_MACRO(__ICC); PRINT_MACRO(__ICC);
PRINT_MACRO(__ICL); PRINT_MACRO(__ICL);
PRINT_MACRO(__ECC);
PRINT_MACRO(__INTEL_COMPILER); PRINT_MACRO(__INTEL_COMPILER);
PRINT_MACRO(__USLC__); PRINT_MACRO(__USLC__);
PRINT_MACRO(__DECCXX); PRINT_MACRO(__DECCXX);
@ -870,6 +871,7 @@ void print_boost_macros()
PRINT_MACRO(BOOST_HAS_TWO_ARG_USE_FACET); PRINT_MACRO(BOOST_HAS_TWO_ARG_USE_FACET);
PRINT_MACRO(BOOST_HAS_UNISTD_H); PRINT_MACRO(BOOST_HAS_UNISTD_H);
PRINT_MACRO(BOOST_HAS_WINTHREADS); PRINT_MACRO(BOOST_HAS_WINTHREADS);
PRINT_MACRO(BOOST_INTEL);
PRINT_MACRO(BOOST_MSVC); PRINT_MACRO(BOOST_MSVC);
PRINT_MACRO(BOOST_MSVC_STD_ITERATOR); PRINT_MACRO(BOOST_MSVC_STD_ITERATOR);
PRINT_MACRO(BOOST_MSVC6_MEMBER_TEMPLATES); PRINT_MACRO(BOOST_MSVC6_MEMBER_TEMPLATES);