feedc0de/boost_bind
1
0
Fork 0
forked from boostorg/bind
Code Pull Requests Activity

Fixx0red several test failures. Hopefully.

Browse Source 
[SVN r31532]
This commit is contained in:
Peter Dimov
2005-11-01 17:57:15 +00:00
parent 35b98458a1
commit 98daeb3ad5
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/bind.hpp
View File

@@ -120,9 +120,9 @@ template<class F> struct unwrapper
return f; 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 ) template<class R, class T> static inline _mfi::dm<R, T> unwrap( R T::* pm, int )

11
include/boost/mem_fn.hpp
View File

@@ -328,11 +328,6 @@ private:
return (u.*f_); 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 template<class U> R const & call(U & u, void const *) const
{ {
return (get_pointer(u)->*f_); return (get_pointer(u)->*f_);
@@ -352,7 +347,7 @@ public:
return (p->*f_); 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); return call(u, &u);
} }
@@ -364,13 +359,13 @@ public:
return (t.*f_); return (t.*f_);
} }
#endif
R const & operator()(T const & t) const R const & operator()(T const & t) const
{ {
return (t.*f_); return (t.*f_);
} }
#endif
bool operator==(dm const & rhs) const bool operator==(dm const & rhs) const
{ {
return f_ == rhs.f_; return f_ == rhs.f_;