Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r86120 - trunk/boost/serialization/detail
From: steveire_at_[hidden]
Date: 2013-10-01 05:53:08


Author: skelly
Date: 2013-10-01 05:53:08 EDT (Tue, 01 Oct 2013)
New Revision: 86120
URL: http://svn.boost.org/trac/boost/changeset/86120

Log:
Serialization: Remove obsolete MSVC version checks.

Text files modified:
   trunk/boost/serialization/detail/shared_ptr_132.hpp | 11 +----------
   1 files changed, 1 insertions(+), 10 deletions(-)

Modified: trunk/boost/serialization/detail/shared_ptr_132.hpp
==============================================================================
--- trunk/boost/serialization/detail/shared_ptr_132.hpp Tue Oct 1 04:48:50 2013 (r86119)
+++ trunk/boost/serialization/detail/shared_ptr_132.hpp 2013-10-01 05:53:08 EDT (Tue, 01 Oct 2013) (r86120)
@@ -208,8 +208,6 @@
 
 #endif
 
-#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
-
     template<class Y>
     shared_ptr & operator=(shared_ptr<Y> const & r) // never throws
     {
@@ -218,8 +216,6 @@
         return *this;
     }
 
-#endif
-
 #ifndef BOOST_NO_AUTO_PTR
 
     template<class Y>
@@ -420,13 +416,8 @@
 
 #else
 
-# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __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;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk