From 8b174c061771aa9457d7f4fb100e84e333336e1d Mon Sep 17 00:00:00 2001
From: jzmaddock <jzmaddock@gmail.com>
Date: Tue, 23 Sep 2014 17:02:30 +0100
Subject: [PATCH] Update for Intel 15.0

---
 include/boost/config/compiler/intel.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp
index 96cdd93c..a72d246c 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -298,6 +298,12 @@ template<> struct assert_intrinsic_wchar_t<unsigned short> {};
 #  undef BOOST_NO_CXX11_RAW_LITERALS
 #  undef BOOST_NO_CXX11_SCOPED_ENUMS
 #endif
+#if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION >= 1500) && !defined(_MSC_VER)
+#  undef BOOST_NO_CXX11_ALIGNAS
+#  undef BOOST_NO_CXX11_CONSTEXPR
+#  undef BOOST_NO_CXX11_NOEXCEPT
+#  undef BOOST_NO_CXX11_USER_DEFINED_LITERALS
+#endif
 
 #if defined(BOOST_INTEL_STDCXX0X) && (BOOST_INTEL_CXX_VERSION <= 1310)
 #  define BOOST_NO_CXX11_HDR_FUTURE