From d28a5cc23a5af0007651873d1b1c4f513f9ff8a7 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Thu, 3 Nov 2005 23:04:18 +0000
Subject: [PATCH] Data members now return a reference... sometimes.

[SVN r31550]
---
 include/boost/bind.hpp | 70 +++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/include/boost/bind.hpp b/include/boost/bind.hpp
index 2b89c13..3324bcf 100644
--- a/include/boost/bind.hpp
+++ b/include/boost/bind.hpp
@@ -1548,13 +1548,24 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 
 // data member pointers
 
-/*
+#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 
-#if defined(__GNUC__) && (__GNUC__ == 2)
+template<class R, class T, class A1>
+_bi::bind_t< R, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >
+    BOOST_BIND(R T::*f, A1 a1)
+{
+    typedef _mfi::dm<R, T> F;
+    typedef typename _bi::list_av_1<A1>::type list_type;
+    return _bi::bind_t<R, F, list_type>( F(f), list_type(a1) );
+}
+
+#else
 
 namespace _bi
 {
 
+#if defined(__GNUC__) && (__GNUC__ == 2)
+
 template<class T> struct add_cref
 {
     typedef T const & type;
@@ -1565,46 +1576,63 @@ template<class T> struct add_cref< T & >
     typedef T const & type;
 };
 
-template<> struct add_cref<void>
+template<> struct add_cref< void >
 {
     typedef void type;
 };
 
+#endif
+
+template<class M, class R> struct dm_result
+{
+    typedef M type;
+};
+
+template<class M, class R> struct dm_result< M, R& >
+{
+    typedef M const & type;
+};
+
 } // namespace _bi
 
-template<class R, class T, class A1>
-_bi::bind_t< typename _bi::add_cref<R>::type, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >
-    BOOST_BIND(R T::*f, A1 a1)
+#if defined(__GNUC__) && (__GNUC__ == 2)
+
+template<class M, class T, class A1>
+_bi::bind_t< typename _bi::add_cref<M>::type, _mfi::dm<M, T>, typename _bi::list_av_1<A1>::type >
+    BOOST_BIND( M T::*f, A1 a1 )
 {
-    typedef _mfi::dm<R, T> F;
+    typedef typename _bi::add_cref<M>::type result_type;
+    typedef _mfi::dm<M, T> F;
     typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<typename _bi::add_cref<R>::type, F, list_type>(F(f), list_type(a1));
+    return _bi::bind_t<result_type, F, list_type>(F(f), list_type(a1));
 }
 
 #else
 
-template<class R, class T, class A1>
-_bi::bind_t< R const &, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >
-    BOOST_BIND(R T::*f, A1 a1)
+template<class M, class T, class A1>
+_bi::bind_t< M const &, _mfi::dm<M, T>, typename _bi::list_av_1<A1>::type >
+    BOOST_BIND( M T::*f, A1 a1 )
 {
-    typedef _mfi::dm<R, T> F;
+    typedef M const & result_type;
+    typedef _mfi::dm<M, T> F;
     typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R const &, F, list_type>(F(f), list_type(a1));
+    return _bi::bind_t<result_type, F, list_type>(F(f), list_type(a1));
 }
 
 #endif
 
-*/
-
-template<class R, class T, class A1>
-_bi::bind_t< R, _mfi::dm<R, T>, typename _bi::list_av_1<A1>::type >
-    BOOST_BIND(R T::*f, A1 a1)
+template<class M, class T, class R2, class F2, class L2>
+_bi::bind_t< typename _bi::dm_result<M, R2>::type, _mfi::dm<M, T>, typename _bi::list_av_1< _bi::bind_t<R2, F2, L2> >::type >
+    BOOST_BIND( M T::*f, _bi::bind_t<R2, F2, L2> a1 )
 {
-    typedef _mfi::dm<R, T> F;
-    typedef typename _bi::list_av_1<A1>::type list_type;
-    return _bi::bind_t<R, F, list_type>( F(f), list_type(a1) );
+    typedef typename _bi::dm_result<M, R2>::type result_type;
+    typedef typename _bi::list_av_1< _bi::bind_t<R2, F2, L2> >::type list_type;
+    typedef _mfi::dm<M, T> F;
+    return _bi::bind_t< result_type, F, list_type >( F(f), list_type(a1) );
 }
 
+#endif
+
 } // namespace boost
 
 #ifndef BOOST_BIND_NO_PLACEHOLDERS