Large patch from Ulrich Eckhardt to fix support for EVC++ 4.

[SVN r30670]
This commit is contained in:
John Maddock
2005-08-25 16:27:28 +00:00
parent 08f517b5b0
commit ff7e027648
3 changed files with 4 additions and 4 deletions

View File

@@ -249,7 +249,7 @@ template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y>
#else #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 // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL
using std::basic_ostream; using std::basic_ostream;
template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, intrusive_ptr<Y> const & p) template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, intrusive_ptr<Y> const & p)

View File

@@ -203,7 +203,7 @@ public:
#endif #endif
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) #if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300)
template<class Y> template<class Y>
shared_ptr & operator=(shared_ptr<Y> const & r) // never throws shared_ptr & operator=(shared_ptr<Y> const & r) // never throws
@@ -429,7 +429,7 @@ template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> co
#else #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 // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL
using std::basic_ostream; 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) template<class E, class T, class Y> basic_ostream<E, T> & operator<< (basic_ostream<E, T> & os, shared_ptr<Y> const & p)

View File

@@ -69,7 +69,7 @@ public:
{ {
} }
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) #if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300)
template<class Y> template<class Y>
weak_ptr & operator=(weak_ptr<Y> const & r) // never throws weak_ptr & operator=(weak_ptr<Y> const & r) // never throws