mirror of
https://github.com/boostorg/smart_ptr.git
synced 2025-07-31 13:17:23 +02:00
Changed #ifdefs so that member templates aren't disabled by an empty config.hpp.
[SVN r14589]
This commit is contained in:
@@ -61,7 +61,7 @@ public:
|
|||||||
if(p_ != 0) intrusive_ptr_release(p_);
|
if(p_ != 0) intrusive_ptr_release(p_);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BOOST_MSVC6_MEMBER_TEMPLATES
|
#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
||||||
|
|
||||||
template<class U> intrusive_ptr(intrusive_ptr<U> const & rhs): p_(rhs.get())
|
template<class U> intrusive_ptr(intrusive_ptr<U> const & rhs): p_(rhs.get())
|
||||||
{
|
{
|
||||||
@@ -75,7 +75,7 @@ public:
|
|||||||
if(p_ != 0) intrusive_ptr_add_ref(p_);
|
if(p_ != 0) intrusive_ptr_add_ref(p_);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BOOST_MSVC6_MEMBER_TEMPLATES
|
#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
||||||
|
|
||||||
template<class U> intrusive_ptr & operator=(intrusive_ptr<U> const & rhs)
|
template<class U> intrusive_ptr & operator=(intrusive_ptr<U> const & rhs)
|
||||||
{
|
{
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp> // for broken compiler workarounds
|
#include <boost/config.hpp> // for broken compiler workarounds
|
||||||
|
|
||||||
#ifndef BOOST_MSVC6_MEMBER_TEMPLATES
|
#if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
||||||
#include <boost/detail/shared_array_nmt.hpp>
|
#include <boost/detail/shared_array_nmt.hpp>
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@@ -151,6 +151,6 @@ template<typename T> void swap(shared_array<T> & a, shared_array<T> & b) // neve
|
|||||||
|
|
||||||
} // namespace boost
|
} // namespace boost
|
||||||
|
|
||||||
#endif // #ifndef BOOST_MSVC6_MEMBER_TEMPLATES
|
#endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
||||||
|
|
||||||
#endif // #ifndef BOOST_SHARED_ARRAY_HPP_INCLUDED
|
#endif // #ifndef BOOST_SHARED_ARRAY_HPP_INCLUDED
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include <boost/config.hpp> // for broken compiler workarounds
|
#include <boost/config.hpp> // for broken compiler workarounds
|
||||||
|
|
||||||
#ifndef BOOST_MSVC6_MEMBER_TEMPLATES
|
#if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
||||||
#include <boost/detail/shared_ptr_nmt.hpp>
|
#include <boost/detail/shared_ptr_nmt.hpp>
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@@ -350,6 +350,6 @@ template<class T> shared_ptr<T> shared_from_this(T * p)
|
|||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // #ifndef BOOST_MSVC6_MEMBER_TEMPLATES
|
#endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
||||||
|
|
||||||
#endif // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
|
#endif // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
|
||||||
|
Reference in New Issue
Block a user