From 4b3077dea3f5b5cc5bc15d3e017e84ddabc5aee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20Krzemie=C5=84ski?= <akrzemi1@gmail.com>
Date: Tue, 20 Oct 2015 23:42:03 +0200
Subject: [PATCH] config: if for intel

---
 include/boost/optional/detail/optional_config.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/optional/detail/optional_config.hpp b/include/boost/optional/detail/optional_config.hpp
index 92a362f..78eadf0 100644
--- a/include/boost/optional/detail/optional_config.hpp
+++ b/include/boost/optional/detail/optional_config.hpp
@@ -59,7 +59,7 @@
 # define BOOST_OPTIONAL_CONFIG_NO_PROPER_ASSIGN_FROM_CONST_INT
 #endif
 
-#if defined(__GNUC__)
+#if (defined __GNUC__) && (!defined BOOST_INTEL_CXX_VERSION)
 // On some GCC versions an unwanted temporary is created when you copy-initialize
 // from a const lvalue of integral type. Thus we bind not to the original address but
 // to a temporary.