Move Intel up the selection list so it's not mistaken for clang.

Refs #7359.

[SVN r82997]
This commit is contained in:
John Maddock
2013-02-19 13:13:12 +00:00
parent a9f844c192
commit 97b4d85e75

View File

@ -33,6 +33,10 @@
// PathScale EKOPath compiler (has to come before clang and gcc) // PathScale EKOPath compiler (has to come before clang and gcc)
# define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp"
#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
// Intel
# define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
#elif defined __clang__ #elif defined __clang__
// Clang C++ emulates GCC, so it has to appear early. // Clang C++ emulates GCC, so it has to appear early.
# define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp"
@ -41,10 +45,6 @@
// Digital Mars C++ // Digital Mars C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/digitalmars.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/digitalmars.hpp"
#elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
// Intel
# define BOOST_COMPILER_CONFIG "boost/config/compiler/intel.hpp"
# elif defined __GNUC__ # elif defined __GNUC__
// GNU C++: // GNU C++:
# define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp" # define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp"