From 1a956992bd95228891e021536a0c7e6bed3e8380 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 9 Aug 2014 00:26:39 +0300 Subject: [PATCH] Extend nullptr_t workaround to Intel C++. --- include/boost/core/addressof.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/core/addressof.hpp b/include/boost/core/addressof.hpp index a90fcc3..6a770e2 100644 --- a/include/boost/core/addressof.hpp +++ b/include/boost/core/addressof.hpp @@ -49,7 +49,7 @@ template struct addressof_impl #if !defined( BOOST_NO_CXX11_NULLPTR ) -#if defined( __clang__ ) && !defined( _LIBCPP_VERSION ) && !defined( BOOST_NO_CXX11_DECLTYPE ) +#if !defined( BOOST_NO_CXX11_DECLTYPE ) && ( ( defined( __clang__ ) && !defined( _LIBCPP_VERSION ) ) || defined( __INTEL_COMPILER ) ) typedef decltype(nullptr) addr_nullptr_t;