[Boost-commit] svn:boost r85929 - in trunk/boost/smart_ptr: . detail

Subject: [Boost-commit] svn:boost r85929 - in trunk/boost/smart_ptr: . detail
From: steveire_at_[hidden]
Date: 2013-09-26 05:39:50

Author: skelly
Date: 2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)
New Revision: 85929
URL: http://svn.boost.org/trac/boost/changeset/85929

Log:
SmartPtr: Remove obsolete MSVC version checks.

Text files modified: 
   trunk/boost/smart_ptr/detail/shared_count.hpp        |     7 -------                                 
   trunk/boost/smart_ptr/detail/sp_counted_base_w32.hpp |    12 ------------                            
   trunk/boost/smart_ptr/detail/spinlock_w32.hpp        |     2 +-                                      
   trunk/boost/smart_ptr/detail/yield_k.hpp             |     2 +-                                      
   trunk/boost/smart_ptr/intrusive_ptr.hpp              |     6 ------                                  
   trunk/boost/smart_ptr/shared_ptr.hpp                 |     6 ------                                  
   trunk/boost/smart_ptr/weak_ptr.hpp                   |     4 ----                                    
   7 files changed, 2 insertions(+), 37 deletions(-)

Modified: trunk/boost/smart_ptr/detail/shared_count.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/shared_count.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/detail/shared_count.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -148,18 +148,11 @@
 #endif
     }
 
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1200 )
-    template<class Y, class D> shared_count( Y * p, D d ): pi_(0)
-#else
     template<class P, class D> shared_count( P p, D d ): pi_(0)
-#endif
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
         , id_(shared_count_id)
 #endif
     {
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, <= 1200 )
-        typedef Y* P;
-#endif
 #ifndef BOOST_NO_EXCEPTIONS
 
         try

Modified: trunk/boost/smart_ptr/detail/sp_counted_base_w32.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/sp_counted_base_w32.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/detail/sp_counted_base_w32.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -80,19 +80,7 @@
         {
             long tmp = static_cast< long const volatile& >( use_count_ );
             if( tmp == 0 ) return false;
-
-#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, == 1200 )
-
-            // work around a code generation bug
-
-            long tmp2 = tmp + 1;
-            if( BOOST_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp2, tmp ) == tmp2 - 1 ) return true;
-
-#else
-
             if( BOOST_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp + 1, tmp ) == tmp ) return true;
-
-#endif
         }
     }
 

Modified: trunk/boost/smart_ptr/detail/spinlock_w32.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/spinlock_w32.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/detail/spinlock_w32.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -24,7 +24,7 @@
 
 #define BOOST_COMPILER_FENCE __memory_barrier();
 
-#elif defined( _MSC_VER ) && _MSC_VER >= 1310
+#elif defined( _MSC_VER )
 
 extern "C" void _ReadWriteBarrier();
 #pragma intrinsic( _ReadWriteBarrier )

Modified: trunk/boost/smart_ptr/detail/yield_k.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/yield_k.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/detail/yield_k.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -27,7 +27,7 @@
 
 // BOOST_SMT_PAUSE
 
-#if defined(_MSC_VER) && _MSC_VER >= 1310 && ( defined(_M_IX86) || defined(_M_X64) )
+#if defined(_MSC_VER) && ( defined(_M_IX86) || defined(_M_X64) )
 
 extern "C" void _mm_pause();
 #pragma intrinsic( _mm_pause )

Modified: trunk/boost/smart_ptr/intrusive_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/intrusive_ptr.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/intrusive_ptr.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -292,13 +292,7 @@
 // in STLport's no-iostreams mode no iostream symbols can be used
 #ifndef _STLP_NO_IOSTREAMS
 
-# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT)
-// MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL
-using std::basic_ostream;
-template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
-# else
 template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)
-# endif 
 {
     os << p.get();
     return os;

Modified: trunk/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/shared_ptr.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/shared_ptr.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -849,13 +849,7 @@
 // in STLport's no-iostreams mode no iostream symbols can be used
 #ifndef _STLP_NO_IOSTREAMS
 
-# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT)
-// MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL
-using std::basic_ostream;
-template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, shared_ptr<Y> const & p)
-# else
 template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p)
-# endif
 {
     os << p.get();
     return os;

Modified: trunk/boost/smart_ptr/weak_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/weak_ptr.hpp	Thu Sep 26 03:46:25 2013	(r85928)
+++ trunk/boost/smart_ptr/weak_ptr.hpp	2013-09-26 05:39:50 EDT (Thu, 26 Sep 2013)	(r85929)
@@ -136,8 +136,6 @@
         boost::detail::sp_assert_convertible< Y, T >();
     }
 
-#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300)
-
     template<class Y>
     weak_ptr & operator=( weak_ptr<Y> const & r ) BOOST_NOEXCEPT
     {
@@ -171,8 +169,6 @@
         return *this;
     }
 
-#endif
-
     shared_ptr<T> lock() const BOOST_NOEXCEPT
     {
         return shared_ptr<T>( *this, boost::detail::sp_nothrow_tag() );