forked from boostorg/smart_ptr
*_ptr.hpp:
- Revert addition of is_pointerlike_helper weak_ptr.hpp: - Revert addition of get_pointer [SVN r15108]
This commit is contained in:
@ -20,7 +20,6 @@
|
||||
#endif
|
||||
|
||||
#include <functional> // std::less
|
||||
#include <boost/type_traits/ice.hpp>
|
||||
|
||||
namespace boost
|
||||
{
|
||||
@ -194,12 +193,6 @@ template<class T> T * get_pointer(intrusive_ptr<T> const & p)
|
||||
return p.get();
|
||||
}
|
||||
|
||||
namespace detail {
|
||||
// is_pointerlike_helper enables Signals library to recognize intrusive_ptr
|
||||
template<typename T>
|
||||
type_traits::yes_type is_pointerlike_helper(const intrusive_ptr<T>&, int);
|
||||
} // end namespace detail
|
||||
|
||||
} // namespace boost
|
||||
|
||||
#ifdef BOOST_MSVC
|
||||
|
@ -14,7 +14,6 @@
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/checked_delete.hpp>
|
||||
#include <boost/type_traits/ice.hpp>
|
||||
|
||||
#ifndef BOOST_NO_AUTO_PTR
|
||||
# include <memory> // for std::auto_ptr
|
||||
@ -120,12 +119,6 @@ template<typename T> inline T * get_pointer(scoped_ptr<T> const & p)
|
||||
return p.get();
|
||||
}
|
||||
|
||||
namespace detail {
|
||||
// is_pointerlike_helper enables Signals library to recognize scoped_ptr
|
||||
template<typename T>
|
||||
type_traits::yes_type is_pointerlike_helper(const scoped_ptr<T>&, int);
|
||||
} // end namespace detail
|
||||
|
||||
} // namespace boost
|
||||
|
||||
#endif // #ifndef BOOST_SCOPED_PTR_HPP_INCLUDED
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include <boost/checked_delete.hpp>
|
||||
#include <boost/throw_exception.hpp>
|
||||
#include <boost/detail/shared_count.hpp>
|
||||
#include <boost/type_traits/ice.hpp>
|
||||
|
||||
#include <memory> // for std::auto_ptr
|
||||
#include <algorithm> // for std::swap
|
||||
@ -324,12 +323,6 @@ template<typename T> inline T * get_pointer(shared_ptr<T> const & p)
|
||||
return p.get();
|
||||
}
|
||||
|
||||
namespace detail {
|
||||
// is_pointerlike_helper enables Signals library to recognize shared_ptr
|
||||
template<typename T>
|
||||
type_traits::yes_type is_pointerlike_helper(const shared_ptr<T>&, int);
|
||||
} // end namespace detail
|
||||
|
||||
// shared_from_this() creates a shared_ptr from a raw pointer (usually 'this')
|
||||
|
||||
namespace detail
|
||||
|
@ -168,19 +168,6 @@ template<class T> shared_ptr<T> make_shared(weak_ptr<T> const & r) // never thro
|
||||
}
|
||||
}
|
||||
|
||||
// mem_fn support
|
||||
|
||||
template<class T> T * get_pointer(weak_ptr<T> const & p)
|
||||
{
|
||||
return p.get();
|
||||
}
|
||||
|
||||
namespace detail {
|
||||
// is_pointerlike_helper enables Signals library to recognize intrusive_ptr
|
||||
template<typename T>
|
||||
type_traits::yes_type is_pointerlike_helper(const weak_ptr<T>&, int);
|
||||
} // end namespace detail
|
||||
|
||||
} // namespace boost
|
||||
|
||||
#ifdef BOOST_MSVC
|
||||
|
Reference in New Issue
Block a user