Ticket #9112: boost-0.41.0-tr1-ref.patch

boost_1_54_0/boost/ref.hpp

@@ -11 +11 @@
 #include <boost/utility/addressof.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/config/no_tr1/functional.hpp> // unary_function, binary_function
 
 //
 //  ref.hpp - ref/cref, useful helper functions
@@ -28 +29 @@
 
 namespace boost
 {
+namespace detail
+{
+    template <class Self, class T>
+    struct reference_wrapper_base_aux
+    {
+    protected:
+        T &aux_get() const {
+            return static_cast<Self const *>(this)->get();
+        }
+    };
+
+    template <class Self, class T> struct reference_wrapper_base {};
+
+    template <class Self, class T, class U>
+    struct reference_wrapper_base<Self, T(U)>
+        : public std::unary_function<U, T>
+    {};
+
+    template <class Self, class T, class U>
+    struct reference_wrapper_base<Self, T(*)(U)>
+        : public std::unary_function<U, T>
+    {};
+
+    template <class Self, class T, class U>
+    struct reference_wrapper_base<Self, T(U::*)()>
+        : public std::unary_function<U*, T>
+        , public reference_wrapper_base_aux<Self, T(U::*)()>
+    {
+        T operator()(U *u) const {
+            return (u->*(this->aux_get()))();
+        }
+        T operator()(U &u) const {
+            return operator()(&u);
+        }
+    };
+
+    template <class Self, class T, class U>
+    struct reference_wrapper_base<Self, T(U::*)() const>
+        : public std::unary_function<const U*, T>
+        , public reference_wrapper_base_aux<Self, T(U::*)() const>
+    {
+        T operator()(const U *u) const {
+            return (u->*(this->aux_get()))();
+        }
+        T operator()(const U &u) const {
+            return operator()(&u);
+        }
+    };
+
+    template <class Self, class T, class U, class V>
+    struct reference_wrapper_base<Self, T(U, V)>
+        : public std::binary_function<U, V, T>
+    {};
+
+    template <class Self, class T, class U, class V>
+    struct reference_wrapper_base<Self, T(*)(U, V)>
+        : public std::binary_function<U, V, T>
+    {};
+
+    template <class Self, class T, class U, class V>
+    struct reference_wrapper_base<Self, T(U::*)(V)>
+        : public std::binary_function<U*, V, T>
+        , public reference_wrapper_base_aux<Self, T(U::*)(V)>
+    {
+        T operator()(U *u, V &v) const {
+            return (u->*(this->aux_get()))(v);
+        }
+        T operator()(U *u, const V &v) const {
+            return (u->*(this->aux_get()))(v);
+        }
+        T operator()(U &u, V &v) const {
+            return operator()(&u, &v);
+        }
+        T operator()(U &u, const V &v) const {
+            return operator()(&u, &v);
+        }
+    };
+
+    template <class Self, class T, class U, class V>
+    struct reference_wrapper_base<Self, T(U::*)(V) const>
+        : public std::binary_function<const U*, V, T>
+        , public reference_wrapper_base_aux<Self, T(U::*)(V)const>
+    {
+        T operator()(const U *u, V &v) const {
+            return (u->*(this->aux_get()))(v);
+        }
+        T operator()(const U *u, const V &v) const {
+            return (u->*(this->aux_get()))(v);
+        }
+        T operator()(const U &u, V &v) const {
+            return operator()(&u, &v);
+        }
+        T operator()(const U &u, const V &v) const {
+            return operator()(&u, &v);
+        }
+    };
+}
 
 template<class T> class reference_wrapper
+  : public detail::reference_wrapper_base<reference_wrapper<T>, T>
 { 
 public:
     typedef T type;