Index: bind.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/bind.hpp,v
retrieving revision 1.33
diff -b -d -u -r1.33 bind.hpp
--- bind.hpp	9 Mar 2004 12:49:00 -0000	1.33
+++ bind.hpp	20 Apr 2004 16:39:21 -0000
@@ -113,10 +113,58 @@
 
 // unwrap
 
+#if defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, <= 0x3003)
+template <class T>
+struct unwrapped_pointer
+{
+    typedef T& type;
+};
+
+template <class R, class T>
+struct unwrapped_pointer<R T::*>
+{
+    typedef _mfi::dm<R, T> type;
+};
+
+// CWPro8 can't parse this specialization
+//
+// template <class R, class T>
+// struct unwrapped_pointer<R T::* const>
+// {
+//     typedef _mfi::dm<R, T> type;
+// };
+//
+// So instead we forward through the following mechanisms
+
+template <class T>
+struct unwrapped_pointer_to_const
+{
+    typedef T const& type;
+};
+
+template <class R, class T>
+struct unwrapped_pointer_to_const<R T::*>
+{
+    typedef _mfi::dm<R, T> type;
+};
+
+template <class T>
+struct unwrapped_pointer<T const>
+  : unwrapped_pointer_to_const<T>
+{
+};
+
+template<class F> inline typename unwrapped_pointer<F>::type unwrap(F * f, long)
+{
+    typedef typename unwrapped_pointer<F>::type r;
+    return r(*f);
+}
+#else
 template<class F> inline F & unwrap(F * f, long)
 {
     return *f;
 }
+#endif
 
 template<class F> inline F & unwrap(reference_wrapper<F> * f, int)
 {
@@ -128,6 +176,7 @@
     return f->get();
 }
 
+#if !defined(__MWERKS__) || !BOOST_WORKAROUND(__MWERKS__, <= 0x3003)
 template<class R, class T> inline _mfi::dm<R, T> unwrap(R T::* * pm, int)
 {
     return _mfi::dm<R, T>(*pm);
@@ -137,6 +186,7 @@
 {
     return _mfi::dm<R, T>(*pm);
 }
+#endif 
 
 // listN