[Boost-commit] svn:boost r74573 - trunk/boost/config/compiler

Subject: [Boost-commit] svn:boost r74573 - trunk/boost/config/compiler
From: john_at_[hidden]
Date: 2011-09-26 07:11:55

Author: johnmaddock
Date: 2011-09-26 07:11:54 EDT (Mon, 26 Sep 2011)
New Revision: 74573
URL: http://svn.boost.org/trac/boost/changeset/74573

Log:
Tentative fox for C++0x detection in Intel 12.1 and later.
Refs #5941.
Refs #5878.
Text files modified: 
   trunk/boost/config/compiler/intel.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: trunk/boost/config/compiler/intel.hpp
==============================================================================
--- trunk/boost/config/compiler/intel.hpp	(original)
+++ trunk/boost/config/compiler/intel.hpp	2011-09-26 07:11:54 EDT (Mon, 26 Sep 2011)
@@ -27,7 +27,7 @@
 #endif
 
 // Flags determined by comparing output of 'icpc -dM -E' with and without '-std=c++0x'
-#if (!(defined(_WIN32) || defined(_WIN64)) && defined(__STDC_HOSTED__) && __STDC_HOSTED__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
+#if (!(defined(_WIN32) || defined(_WIN64)) && defined(__STDC_HOSTED__) && (__STDC_HOSTED__ && (BOOST_INTEL_CXX_VERSION <= 1200))) || defined(__GXX_EXPERIMENTAL_CPP0X__)
 #  define BOOST_INTEL_STDCXX0X
 #endif
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)