forked from boostorg/bind
Fixx0red several test failures. Hopefully.
[SVN r31532]
This commit is contained in:
@@ -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 )
|
||||
|
@@ -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_;
|
||||
|
Reference in New Issue
Block a user