From a8f96e4b6e2c06c023889d798ab25dc7f39a3fb1 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Wed, 12 Aug 2015 19:47:56 +0100
Subject: [PATCH] Intel should not set GCC and MSVC specific macros.

---
 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 ecfacc5e..7789b944 100644
--- a/include/boost/config/compiler/intel.hpp
+++ b/include/boost/config/compiler/intel.hpp
@@ -20,6 +20,9 @@
 
 #include <boost/config/compiler/visualc.hpp>
 
+#undef BOOST_MSVC
+#undef BOOST_MSVC_FULL_VER
+
 #if (__INTEL_COMPILER >= 1500) && (_MSC_VER >= 1900)
 //
 // These appear to be supported, even though VC++ may not support them:
@@ -36,6 +39,9 @@
 
 #include <boost/config/compiler/gcc.hpp>
 
+#undef BOOST_GCC_VERSION
+#undef BOOST_GCC_CXX11
+
 #endif
 
 #undef BOOST_COMPILER