From 98daeb3ad57d81d6a4893a7c87ea6d70c5477d69 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Tue, 1 Nov 2005 17:57:15 +0000
Subject: [PATCH] Fixx0red several test failures. Hopefully.

[SVN r31532]
---
 include/boost/bind.hpp   |  4 ++--
 include/boost/mem_fn.hpp | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/include/boost/bind.hpp b/include/boost/bind.hpp
index bf4325a..2b89c13 100644
--- a/include/boost/bind.hpp
+++ b/include/boost/bind.hpp
@@ -120,9 +120,9 @@ template<class F> struct unwrapper
         return f;
     }
 
-    template<class F2> static inline F2 & unwrap( reference_wrapper<F2> const & f, int )
+    template<class F2> static inline F2 & unwrap( reference_wrapper<F2> rf, int )
     {
-        return f->get();
+        return rf.get();
     }
 
     template<class R, class T> static inline _mfi::dm<R, T> unwrap( R T::* pm, int )
diff --git a/include/boost/mem_fn.hpp b/include/boost/mem_fn.hpp
index 7097d43..9695f57 100644
--- a/include/boost/mem_fn.hpp
+++ b/include/boost/mem_fn.hpp
@@ -328,11 +328,6 @@ private:
         return (u.*f_);
     }
 
-    template<class U> R & call(U & u, T *) const
-    {
-        return (u.*f_);
-    }
-
     template<class U> R const & call(U & u, void const *) const
     {
         return (get_pointer(u)->*f_);
@@ -352,7 +347,7 @@ public:
         return (p->*f_);
     }
 
-    template<class U> R const & operator()(U & u) const
+    template<class U> R const & operator()(U const & u) const
     {
         return call(u, &u);
     }
@@ -364,13 +359,13 @@ public:
         return (t.*f_);
     }
 
-#endif
-
     R const & operator()(T const & t) const
     {
         return (t.*f_);
     }
 
+#endif
+
     bool operator==(dm const & rhs) const
     {
         return f_ == rhs.f_;