From ff7e0276487082d5e63f84b1fb9bdaf08646d26b Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 25 Aug 2005 16:27:28 +0000 Subject: [PATCH] Large patch from Ulrich Eckhardt to fix support for EVC++ 4. [SVN r30670] --- include/boost/intrusive_ptr.hpp | 2 +- include/boost/shared_ptr.hpp | 4 ++-- include/boost/weak_ptr.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/intrusive_ptr.hpp b/include/boost/intrusive_ptr.hpp index 7efbade..dd8cc39 100644 --- a/include/boost/intrusive_ptr.hpp +++ b/include/boost/intrusive_ptr.hpp @@ -249,7 +249,7 @@ template std::ostream & operator<< (std::ostream & os, intrusive_ptr #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# 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 basic_ostream & operator<< (basic_ostream & os, intrusive_ptr const & p) diff --git a/include/boost/shared_ptr.hpp b/include/boost/shared_ptr.hpp index 8d6196c..baa374b 100644 --- a/include/boost/shared_ptr.hpp +++ b/include/boost/shared_ptr.hpp @@ -203,7 +203,7 @@ public: #endif -#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) +#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300) template shared_ptr & operator=(shared_ptr const & r) // never throws @@ -429,7 +429,7 @@ template std::ostream & operator<< (std::ostream & os, shared_ptr co #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# 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 basic_ostream & operator<< (basic_ostream & os, shared_ptr const & p) diff --git a/include/boost/weak_ptr.hpp b/include/boost/weak_ptr.hpp index c238500..a4073fc 100644 --- a/include/boost/weak_ptr.hpp +++ b/include/boost/weak_ptr.hpp @@ -69,7 +69,7 @@ public: { } -#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) +#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300) template weak_ptr & operator=(weak_ptr const & r) // never throws