[multiple changes]

2005-11-13  Jonathan Wakely  <redi@gcc.gnu.org>

	* include/tr1/boost_shared_ptr.h (get_deleter):
	Declare before shared_ptr.
	(shared_ptr<>): Declare get_deleter as friend.
	(shared_ptr<>:_M_get_deleter): Private.

2005-11-13  Douglas Gregor  <doug.gregor@gmail.com>

	PR libstdc++/24818
        * include/tr1/ref_wrap_iterate.h
        (reference_wrapper::operator()()): Don't dereferene the result of
        get() before calling it; it's already a reference.
        * testsuite/tr1/3_function_objects/reference_wrapper/invoke.cc:
        Test nullary calls to reference_wrappers.

From-SVN: r106863

diff --git a/libstdc++-v3/include/tr1/boost_shared_ptr.h b/libstdc++-v3/include/tr1/boost_shared_ptr.h
index ec940a9c25f91741e30203ba073a767e5d18afdc..cb19019152115f9d2884058e848c20677a4a5386 100644 (file)
--- a/libstdc++-v3/include/tr1/boost_shared_ptr.h
+++ b/libstdc++-v3/include/tr1/boost_shared_ptr.h
@@ -421,6 +421,9 @@ shared_count::shared_count(const weak_count& __r)
 
 
 // fwd decls
+template<typename _Tp>
+  class shared_ptr;
+
 template<typename _Tp>
   class weak_ptr;
 
@@ -466,6 +469,11 @@ inline void
 __enable_shared_from_this(const shared_count&, ...)
 { }
 
+
+// get_deleter must be declared before friend declaration by shared_ptr.
+template<typename _Del, typename _Tp>
+  _Del* get_deleter(const shared_ptr<_Tp>&);
+
 /**
  *  @class shared_ptr <tr1/memory>
  *
@@ -473,7 +481,6 @@ __enable_shared_from_this(const shared_count&, ...)
  *  The object pointed to is deleted when the last shared_ptr pointing to it
  *  is destroyed or reset.
  */
-
 template<typename _Tp>
   class shared_ptr
   {
@@ -672,11 +679,11 @@ template<typename _Tp>
       _M_refcount.swap(__other._M_refcount);
     }
 
+  private:
     void*
     _M_get_deleter(const std::type_info& __ti) const
     { return _M_refcount.get_deleter(__ti); }
 
-  private:
     template<typename _Tp1>
       bool
       _M_less(const shared_ptr<_Tp1>& __rhs) const
@@ -685,6 +692,9 @@ template<typename _Tp>
     template<typename _Tp1> friend class shared_ptr;
     template<typename _Tp1> friend class weak_ptr;
 
+    template<typename _Del, typename _Tp1>
+      friend _Del* get_deleter(const shared_ptr<_Tp1>&);
+
     // friends injected into enclosing namespace and found by ADL:
     template<typename _Tp1>
       friend inline bool