From 513752eee50e714fc7d30badd572847f1ac69896 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 10 Apr 2002 14:12:12 +0000 Subject: [PATCH] Worked around an MSVC 6 bug (Markus Schoepflin) [SVN r13430] --- include/boost/shared_ptr.hpp | 6 +++++- include/boost/weak_ptr.hpp | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/boost/shared_ptr.hpp b/include/boost/shared_ptr.hpp index 0c00e9a..ad013d3 100644 --- a/include/boost/shared_ptr.hpp +++ b/include/boost/shared_ptr.hpp @@ -140,7 +140,9 @@ public: { } -#endif +#endif + +#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) template shared_ptr & operator=(shared_ptr const & r) // never throws @@ -150,6 +152,8 @@ public: return *this; } +#endif + #ifndef BOOST_NO_AUTO_PTR template diff --git a/include/boost/weak_ptr.hpp b/include/boost/weak_ptr.hpp index 356ab60..01c248c 100644 --- a/include/boost/weak_ptr.hpp +++ b/include/boost/weak_ptr.hpp @@ -51,6 +51,8 @@ public: { } +#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) + template weak_ptr & operator=(weak_ptr const & r) // never throws { @@ -67,6 +69,8 @@ public: return *this; } +#endif + void reset() { this_type().swap(*this);