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

Subject: [Boost-commit] svn:boost r86063 - in trunk/boost/smart_ptr: . detail
From: steveire_at_[hidden]
Date: 2013-09-30 11:57:14

Author: skelly
Date: 2013-09-30 11:57:14 EDT (Mon, 30 Sep 2013)
New Revision: 86063
URL: http://svn.boost.org/trac/boost/changeset/86063

Log:
SmartPointer: Remove obsolete GCC version checks.

Text files modified: 
   trunk/boost/smart_ptr/detail/sp_convertible.hpp |     4 ----                                    
   trunk/boost/smart_ptr/intrusive_ptr.hpp         |    23 -----------------------                 
   trunk/boost/smart_ptr/shared_ptr.hpp            |    29 ++---------------------------           
   3 files changed, 2 insertions(+), 54 deletions(-)

Modified: trunk/boost/smart_ptr/detail/sp_convertible.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/sp_convertible.hpp	Mon Sep 30 11:56:52 2013	(r86062)
+++ trunk/boost/smart_ptr/detail/sp_convertible.hpp	2013-09-30 11:57:14 EDT (Mon, 30 Sep 2013)	(r86063)
@@ -21,10 +21,6 @@
 # define BOOST_SP_NO_SP_CONVERTIBLE
 #endif
 
-#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ < 303 )
-# define BOOST_SP_NO_SP_CONVERTIBLE
-#endif
-
 #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) && defined( __BORLANDC__ ) && ( __BORLANDC__ < 0x630 )
 # define BOOST_SP_NO_SP_CONVERTIBLE
 #endif

Modified: trunk/boost/smart_ptr/intrusive_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/intrusive_ptr.hpp	Mon Sep 30 11:56:52 2013	(r86062)
+++ trunk/boost/smart_ptr/intrusive_ptr.hpp	2013-09-30 11:57:14 EDT (Mon, 30 Sep 2013)	(r86063)
@@ -208,17 +208,6 @@
     return a != b.get();
 }
 
-#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-
-// Resolve the ambiguity between our op!= and the one in rel_ops
-
-template<class T> inline bool operator!=(intrusive_ptr<T> const & a, intrusive_ptr<T> const & b)
-{
-    return a.get() != b.get();
-}
-
-#endif
-
 #if !defined( BOOST_NO_CXX11_NULLPTR )
 
 template<class T> inline bool operator==( intrusive_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT
@@ -279,16 +268,6 @@
 
 #if !defined(BOOST_NO_IOSTREAM)
 
-#if ( defined(__GNUC__) &&  (__GNUC__ < 3) )
-
-template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p)
-{
-    os << p.get();
-    return os;
-}
-
-#else
-
 // in STLport's no-iostreams mode no iostream symbols can be used
 #ifndef _STLP_NO_IOSTREAMS
 
@@ -300,8 +279,6 @@
 
 #endif // _STLP_NO_IOSTREAMS
 
-#endif // __GNUC__ < 3
-
 #endif // !defined(BOOST_NO_IOSTREAM)
 
 // hash_value

Modified: trunk/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/shared_ptr.hpp	Mon Sep 30 11:56:52 2013	(r86062)
+++ trunk/boost/smart_ptr/shared_ptr.hpp	2013-09-30 11:57:14 EDT (Mon, 30 Sep 2013)	(r86063)
@@ -740,17 +740,6 @@
     return a.get() != b.get();
 }
 
-#if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
-
-// Resolve the ambiguity between our op!= and the one in rel_ops
-
-template<class T> inline bool operator!=(shared_ptr<T> const & a, shared_ptr<T> const & b) BOOST_NOEXCEPT
-{
-    return a.get() != b.get();
-}
-
-#endif
-
 #if !defined( BOOST_NO_CXX11_NULLPTR )
 
 template<class T> inline bool operator==( shared_ptr<T> const & p, boost::detail::sp_nullptr_t ) BOOST_NOEXCEPT
@@ -836,16 +825,6 @@
 
 #if !defined(BOOST_NO_IOSTREAM)
 
-#if ( defined(__GNUC__) &&  (__GNUC__ < 3) )
-
-template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p)
-{
-    os << p.get();
-    return os;
-}
-
-#else
-
 // in STLport's no-iostreams mode no iostream symbols can be used
 #ifndef _STLP_NO_IOSTREAMS
 
@@ -857,8 +836,6 @@
 
 #endif // _STLP_NO_IOSTREAMS
 
-#endif // __GNUC__ < 3
-
 #endif // !defined(BOOST_NO_IOSTREAM)
 
 // get_deleter
@@ -866,12 +843,10 @@
 namespace detail
 {
 
-#if ( defined(__GNUC__) && BOOST_WORKAROUND(__GNUC__, < 3) ) || \
-    ( defined(__EDG_VERSION__) && BOOST_WORKAROUND(__EDG_VERSION__, <= 238) ) || \
+#if ( defined(__EDG_VERSION__) && BOOST_WORKAROUND(__EDG_VERSION__, <= 238) ) || \
     ( defined(__HP_aCC) && BOOST_WORKAROUND(__HP_aCC, <= 33500) )
 
-// g++ 2.9x doesn't allow static_cast<X const *>(void *)
-// apparently EDG 2.38 and HP aCC A.03.35 also don't accept it
+// EDG 2.38 and HP aCC A.03.35 don't allow static_cast<X const *>(void *)
 
 template<class D, class T> D * basic_get_deleter(shared_ptr<T> const & p)
 {