feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Remove uses of BOOST_NO_MEMBER_TEMPLATE_FRIENDS

Browse Source
This commit is contained in:
Peter Dimov
2024-09-24 18:33:22 +03:00
parent d2c2407585
commit 66e6f9b2ef
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/smart_ptr/enable_shared_from_raw.hpp
View File

@@ -71,15 +71,12 @@ private:
} }
} }
#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
public:
#else
private: private:
template<class Y> friend class shared_ptr; template<class Y> friend class shared_ptr;
template<typename T> friend boost::shared_ptr<T> shared_from_raw(T *); template<typename T> friend boost::shared_ptr<T> shared_from_raw(T *);
template<typename T> friend boost::weak_ptr<T> weak_from_raw(T *); template<typename T> friend boost::weak_ptr<T> weak_from_raw(T *);
template< class X, class Y > friend inline void detail::sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe ); template< class X, class Y > friend inline void detail::sp_enable_shared_from_this( boost::shared_ptr<X> * ppx, Y const * py, boost::enable_shared_from_raw const * pe );
#endif
shared_ptr<void const volatile> shared_from_this() const shared_ptr<void const volatile> shared_from_this() const
{ {

7
include/boost/smart_ptr/shared_ptr.hpp
View File

@@ -839,19 +839,12 @@ public:
return pn; return pn;
} }
// Tasteless as this may seem, making all members public allows member templates
// to work in the absence of member template friends. (Matthew Langston)
#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
private: private:
template<class Y> friend class shared_ptr; template<class Y> friend class shared_ptr;
template<class Y> friend class weak_ptr; template<class Y> friend class weak_ptr;
#endif
element_type * px; // contained pointer element_type * px; // contained pointer
boost::detail::shared_count pn; // reference counter boost::detail::shared_count pn; // reference counter

7
include/boost/smart_ptr/weak_ptr.hpp
View File

@@ -249,18 +249,11 @@ public:
return pn.hash_value(); return pn.hash_value();
} }
// Tasteless as this may seem, making all members public allows member templates
// to work in the absence of member template friends. (Matthew Langston)
#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
private: private:
template<class Y> friend class weak_ptr; template<class Y> friend class weak_ptr;
template<class Y> friend class shared_ptr; template<class Y> friend class shared_ptr;
#endif
element_type * px; // contained pointer element_type * px; // contained pointer
boost::detail::weak_count pn; // reference counter boost::detail::weak_count pn; // reference counter