diff options
Diffstat (limited to 'boost/phoenix/bind/detail/member_function_ptr.hpp')
| -rw-r--r-- | boost/phoenix/bind/detail/member_function_ptr.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/boost/phoenix/bind/detail/member_function_ptr.hpp b/boost/phoenix/bind/detail/member_function_ptr.hpp index 453e1b40e3..7854dfc6d3 100644 --- a/boost/phoenix/bind/detail/member_function_ptr.hpp +++ b/boost/phoenix/bind/detail/member_function_ptr.hpp @@ -28,8 +28,8 @@ namespace boost { namespace phoenix { namespace detail { typedef typename member_function_ptr_impl<N>:: template impl<RT, FP> base; - member_function_ptr(FP fp) - : base(fp) {} + member_function_ptr(FP fp_) + : base(fp_) {} using base::fp; @@ -39,7 +39,7 @@ namespace boost { namespace phoenix { namespace detail } template <int M, typename RhsRT, typename RhsFP> - bool operator==(member_function_ptr<M, RhsRT, RhsFP> const & rhs) const + bool operator==(member_function_ptr<M, RhsRT, RhsFP> const &) const { return false; } @@ -53,15 +53,15 @@ namespace boost { namespace phoenix { namespace detail { typedef RT result_type; - impl(FP fp) - : fp(fp) {} + impl(FP fp_) + : fp(fp_) {} template <typename Class> RT operator()(Class& obj) const { BOOST_PROTO_USE_GET_POINTER(); - typedef typename proto::detail::classtypeof<FP>::type class_type; + typedef typename proto::detail::class_member_traits<FP>::class_type class_type; return (BOOST_PROTO_GET_POINTER(class_type, obj) ->*fp)(); } @@ -124,15 +124,15 @@ namespace boost { namespace phoenix { namespace detail { typedef RT result_type; - impl(FP fp) - : fp(fp) {} + impl(FP fp_) + : fp(fp_) {} template <typename Class, BOOST_PHOENIX_typename_A> RT operator()(Class& obj, BOOST_PHOENIX_A_ref_a) const { BOOST_PROTO_USE_GET_POINTER(); - typedef typename proto::detail::classtypeof<FP>::type class_type; + typedef typename proto::detail::class_member_traits<FP>::class_type class_type; return (BOOST_PROTO_GET_POINTER(class_type, obj)->*fp)(BOOST_PHOENIX_a); } |