From a7ade6f062eaa41424b86e57afe7b0de92f17fdf Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Tue, 17 May 2016 18:34:18 +0300
Subject: [PATCH] Remove unnecessary #ifdef

---
 include/boost/smart_ptr/intrusive_ptr.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/boost/smart_ptr/intrusive_ptr.hpp b/include/boost/smart_ptr/intrusive_ptr.hpp
index ba3f30b..dceb817 100644
--- a/include/boost/smart_ptr/intrusive_ptr.hpp
+++ b/include/boost/smart_ptr/intrusive_ptr.hpp
@@ -122,19 +122,22 @@ public:
         return *this;
     }
 
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
     template<class U> friend class intrusive_ptr;
+
     template<class U>
 #if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
+
     intrusive_ptr(intrusive_ptr<U> && rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty())
+
 #else
+
     intrusive_ptr(intrusive_ptr<U> && rhs)
+
 #endif        
     : px( rhs.px )
     {
         rhs.px = 0;
     }
-#endif
 
 #endif