diff options
Diffstat (limited to 'boost/serialization/detail/shared_ptr_132.hpp')
| -rw-r--r-- | boost/serialization/detail/shared_ptr_132.hpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/boost/serialization/detail/shared_ptr_132.hpp b/boost/serialization/detail/shared_ptr_132.hpp index 969b53a77b..ee98b7b944 100644 --- a/boost/serialization/detail/shared_ptr_132.hpp +++ b/boost/serialization/detail/shared_ptr_132.hpp @@ -120,13 +120,8 @@ public: { } -#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x564) ) template<class Y> explicit shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete -#else - template<class Y> - explicit shared_ptr(Y * p): px(p), pn(p, boost::checked_deleter<Y>()) // Y must be complete -#endif { detail::sp_enable_shared_from_this( pn, p, p ); } @@ -145,15 +140,13 @@ public: // generated copy constructor, assignment, destructor are fine... // except that Borland C++ has a bug, and g++ with -Wsynth warns -#if defined(__BORLANDC__) || defined(__GNUC__) - +#if defined(__GNUC__) shared_ptr & operator=(shared_ptr const & r) // never throws { px = r.px; pn = r.pn; // shared_count::op= doesn't throw return *this; } - #endif template<class Y> |