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

Subject: [Boost-commit] svn:boost r85249 - trunk/boost/config/compiler
From: john_at_[hidden]
Date: 2013-08-09 04:15:46

Author: johnmaddock
Date: 2013-08-09 04:15:45 EDT (Fri, 09 Aug 2013)
New Revision: 85249
URL: http://svn.boost.org/trac/boost/changeset/85249

Log:
Update for Intel 13.1 July 2013 release.

Text files modified: 
   trunk/boost/config/compiler/intel.hpp |    11 +++++++++--                             
   1 files changed, 9 insertions(+), 2 deletions(-)

Modified: trunk/boost/config/compiler/intel.hpp
==============================================================================
--- trunk/boost/config/compiler/intel.hpp	Thu Aug  8 18:01:18 2013	(r85248)
+++ trunk/boost/config/compiler/intel.hpp	2013-08-09 04:15:45 EDT (Fri, 09 Aug 2013)	(r85249)
@@ -111,7 +111,7 @@
 #     define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 #  endif
 #endif
-#if (defined(__GNUC__) && (__GNUC__ < 4)) || defined(_WIN32) || (BOOST_INTEL_CXX_VERSION <= 1200)
+#if (defined(__GNUC__) && (__GNUC__ < 4)) || (defined(_WIN32) && (BOOST_INTEL_CXX_VERSION <= 1200)) || (BOOST_INTEL_CXX_VERSION <= 1200)
 // GCC or VC emulation:
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #endif
@@ -256,7 +256,9 @@
 #  define  BOOST_NO_CXX11_DELETED_FUNCTIONS
 #  define  BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
 #  define  BOOST_NO_CXX11_TEMPLATE_ALIASES
-#  define  BOOST_NO_CXX11_TRAILING_RESULT_TYPES
+#  if(BOOST_INTEL_CXX_VERSION < 1310)
+#     define  BOOST_NO_CXX11_TRAILING_RESULT_TYPES
+#  endif
 #endif
 
 #if (BOOST_INTEL_CXX_VERSION < 1200)
@@ -266,6 +268,11 @@
 #  define BOOST_NO_FENV_H
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#  define BOOST_HAS_STDINT_H
+#endif
+
+
 //
 // last known and checked version:
 #if (BOOST_INTEL_CXX_VERSION > 1200)