From 7b71068b52c3ba85e7d91c3fd18f6ccb3eca734f Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 9 Aug 2014 00:26:00 +0300 Subject: [PATCH] Extend nullptr_t workaround to Intel C++. --- include/boost/smart_ptr/detail/sp_nullptr_t.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/smart_ptr/detail/sp_nullptr_t.hpp b/include/boost/smart_ptr/detail/sp_nullptr_t.hpp index ccbb123..219ae80 100644 --- a/include/boost/smart_ptr/detail/sp_nullptr_t.hpp +++ b/include/boost/smart_ptr/detail/sp_nullptr_t.hpp @@ -26,7 +26,7 @@ namespace boost namespace detail { -#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) sp_nullptr_t;