Skip to content

R
riscv-gcc-1
Commit 8d907696 by Jonathan Wakely Committed by Jonathan Wakely
Options

Add support for ref-qualified functions to std::mem_fn 

	PR libstdc++/57898
	* include/std/functional (_Mem_fn_traits_base): New class template.
	(_Mem_fn_traits): New class template with specializations for every
	combination of cv-qualified and ref-qualified member function.
	(_Mem_fn_base): New class template for all pointer to member function
	types and partial specialization for pointer to member object types.
	(_Mem_fn): Inherit from _Mem_fn_base.
	* testsuite/20_util/function_objects/mem_fn/refqual.cc: New.

From-SVN: r217024
parent 2ba89c14
Showing with 214 additions and 275 deletions
libstdc++-v3/ChangeLog
2014-11-02 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/57898
* include/std/functional (_Mem_fn_traits_base): New class template.
(_Mem_fn_traits): New class template with specializations for every
combination of cv-qualified and ref-qualified member function.
(_Mem_fn_base): New class template for all pointer to member function
types and partial specialization for pointer to member object types.
(_Mem_fn): Inherit from _Mem_fn_base.
* testsuite/20_util/function_objects/mem_fn/refqual.cc: New.
2014-10-31 Jonathan Wakely <jwakely@redhat.com> 2014-10-31 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_bvector.h (_Bvector_base): Use allocator_traits. * include/bits/stl_bvector.h (_Bvector_base): Use allocator_traits.
......
libstdc++-v3/include/std/functional
...@@ -504,344 +504,231 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) ...@@ -504,344 +504,231 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
struct _Maybe_unary_or_binary_function<_Res, _T1, _T2> struct _Maybe_unary_or_binary_function<_Res, _T1, _T2>
: std::binary_function<_T1, _T2, _Res> { }; : std::binary_function<_T1, _T2, _Res> { };
/// Implementation of @c mem_fn for member function pointers. template<typename _Signature>
struct _Mem_fn_traits;
template<typename _Res, typename _Class, typename... _ArgTypes> template<typename _Res, typename _Class, typename... _ArgTypes>
class _Mem_fn<_Res (_Class::*)(_ArgTypes...)> struct _Mem_fn_traits_base
: public _Maybe_unary_or_binary_function<_Res, _Class*, _ArgTypes...>
{ {
typedef _Res (_Class::*_Functor)(_ArgTypes...); using __result_type = _Res;
using __class_type = _Class;
using __arg_types = _Pack<_ArgTypes...>;
using __maybe_type
= _Maybe_unary_or_binary_function<_Res, _Class*, _ArgTypes...>;
};
template<typename _Tp, typename... _Args> template<typename _Res, typename _Class, typename... _ArgTypes>
_Res struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...)>
_M_call(_Tp&& __object, const volatile _Class *, : _Mem_fn_traits_base<_Res, _Class, _ArgTypes...>
_Args&&... __args) const
{ {
return (std::forward<_Tp>(__object).*__pmf) using __pmf_type = _Res (_Class::*)(_ArgTypes...);
(std::forward<_Args>(__args)...); using __lvalue = true_type;
} using __rvalue = true_type;
};
template<typename _Tp, typename... _Args>
_Res
_M_call(_Tp&& __ptr, const volatile void *, _Args&&... __args) const
{ return ((*__ptr).*__pmf)(std::forward<_Args>(__args)...); }
// Require each _Args to be convertible to corresponding _ArgTypes
template<typename... _Args>
using _RequireValidArgs
= _Require<_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
// Require each _Args to be convertible to corresponding _ArgTypes
// and require _Tp is not _Class, _Class& or _Class*
template<typename _Tp, typename... _Args>
using _RequireValidArgs2
= _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
// Require each _Args to be convertible to corresponding _ArgTypes
// and require _Tp is _Class or derived from _Class
template<typename _Tp, typename... _Args>
using _RequireValidArgs3
= _Require<is_base_of<_Class, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
public:
typedef _Res result_type;
explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
// Handle objects
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>>
_Res
operator()(_Class& __object, _Args&&... __args) const
{ return (__object.*__pmf)(std::forward<_Args>(__args)...); }
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> template<typename _Res, typename _Class, typename... _ArgTypes>
_Res struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) const>
operator()(_Class&& __object, _Args&&... __args) const : _Mem_fn_traits_base<_Res, const _Class, _ArgTypes...>
{ {
return (std::move(__object).*__pmf)(std::forward<_Args>(__args)...); using __pmf_type = _Res (_Class::*)(_ArgTypes...) const;
} using __lvalue = true_type;
using __rvalue = true_type;
// Handle pointers };
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>>
_Res
operator()(_Class* __object, _Args&&... __args) const
{ return (__object->*__pmf)(std::forward<_Args>(__args)...); }
// Handle smart pointers, references and pointers to derived template<typename _Res, typename _Class, typename... _ArgTypes>
template<typename _Tp, typename... _Args, struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) volatile>
typename _Req = _RequireValidArgs2<_Tp, _Args...>> : _Mem_fn_traits_base<_Res, volatile _Class, _ArgTypes...>
_Res
operator()(_Tp&& __object, _Args&&... __args) const
{ {
return _M_call(std::forward<_Tp>(__object), &__object, using __pmf_type = _Res (_Class::*)(_ArgTypes...) volatile;
std::forward<_Args>(__args)...); using __lvalue = true_type;
} using __rvalue = true_type;
template<typename _Tp, typename... _Args,
typename _Req = _RequireValidArgs3<_Tp, _Args...>>
_Res
operator()(reference_wrapper<_Tp> __ref, _Args&&... __args) const
{ return operator()(__ref.get(), std::forward<_Args>(__args)...); }
private:
_Functor __pmf;
}; };
/// Implementation of @c mem_fn for const member function pointers.
template<typename _Res, typename _Class, typename... _ArgTypes> template<typename _Res, typename _Class, typename... _ArgTypes>
class _Mem_fn<_Res (_Class::*)(_ArgTypes...) const> struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) const volatile>
: public _Maybe_unary_or_binary_function<_Res, const _Class*, : _Mem_fn_traits_base<_Res, const volatile _Class, _ArgTypes...>
_ArgTypes...>
{ {
typedef _Res (_Class::*_Functor)(_ArgTypes...) const; using __pmf_type = _Res (_Class::*)(_ArgTypes...) const volatile;
using __lvalue = true_type;
using __rvalue = true_type;
};
template<typename _Tp, typename... _Args> template<typename _Res, typename _Class, typename... _ArgTypes>
_Res struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...)&>
_M_call(_Tp&& __object, const volatile _Class *, : _Mem_fn_traits_base<_Res, _Class, _ArgTypes...>
_Args&&... __args) const
{ {
return (std::forward<_Tp>(__object).*__pmf) using __pmf_type = _Res (_Class::*)(_ArgTypes...)&;
(std::forward<_Args>(__args)...); using __lvalue = true_type;
} using __rvalue = false_type;
};
template<typename _Tp, typename... _Args>
_Res
_M_call(_Tp&& __ptr, const volatile void *, _Args&&... __args) const
{ return ((*__ptr).*__pmf)(std::forward<_Args>(__args)...); }
template<typename... _Args>
using _RequireValidArgs
= _Require<_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
template<typename _Tp, typename... _Args>
using _RequireValidArgs2
= _Require<_NotSame<_Class, _Tp>, _NotSame<const _Class*, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
template<typename _Tp, typename... _Args>
using _RequireValidArgs3
= _Require<is_base_of<_Class, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
public:
typedef _Res result_type;
explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
// Handle objects
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>>
_Res
operator()(const _Class& __object, _Args&&... __args) const
{ return (__object.*__pmf)(std::forward<_Args>(__args)...); }
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> template<typename _Res, typename _Class, typename... _ArgTypes>
_Res struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) const&>
operator()(const _Class&& __object, _Args&&... __args) const : _Mem_fn_traits_base<_Res, const _Class, _ArgTypes...>
{ {
return (std::move(__object).*__pmf)(std::forward<_Args>(__args)...); using __pmf_type = _Res (_Class::*)(_ArgTypes...) const&;
} using __lvalue = true_type;
using __rvalue = false_type;
// Handle pointers };
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>>
_Res
operator()(const _Class* __object, _Args&&... __args) const
{ return (__object->*__pmf)(std::forward<_Args>(__args)...); }
// Handle smart pointers, references and pointers to derived template<typename _Res, typename _Class, typename... _ArgTypes>
template<typename _Tp, typename... _Args, struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) volatile&>
typename _Req = _RequireValidArgs2<_Tp, _Args...>> : _Mem_fn_traits_base<_Res, volatile _Class, _ArgTypes...>
_Res operator()(_Tp&& __object, _Args&&... __args) const
{ {
return _M_call(std::forward<_Tp>(__object), &__object, using __pmf_type = _Res (_Class::*)(_ArgTypes...) volatile&;
std::forward<_Args>(__args)...); using __lvalue = true_type;
} using __rvalue = false_type;
template<typename _Tp, typename... _Args,
typename _Req = _RequireValidArgs3<_Tp, _Args...>>
_Res
operator()(reference_wrapper<_Tp> __ref, _Args&&... __args) const
{ return operator()(__ref.get(), std::forward<_Args>(__args)...); }
private:
_Functor __pmf;
}; };
/// Implementation of @c mem_fn for volatile member function pointers.
template<typename _Res, typename _Class, typename... _ArgTypes> template<typename _Res, typename _Class, typename... _ArgTypes>
class _Mem_fn<_Res (_Class::*)(_ArgTypes...) volatile> struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) const volatile&>
: public _Maybe_unary_or_binary_function<_Res, volatile _Class*, : _Mem_fn_traits_base<_Res, const volatile _Class, _ArgTypes...>
_ArgTypes...>
{ {
typedef _Res (_Class::*_Functor)(_ArgTypes...) volatile; using __pmf_type = _Res (_Class::*)(_ArgTypes...) const volatile&;
using __lvalue = true_type;
using __rvalue = false_type;
};
template<typename _Tp, typename... _Args> template<typename _Res, typename _Class, typename... _ArgTypes>
_Res struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...)&&>
_M_call(_Tp&& __object, const volatile _Class *, : _Mem_fn_traits_base<_Res, _Class, _ArgTypes...>
_Args&&... __args) const
{ {
return (std::forward<_Tp>(__object).*__pmf) using __pmf_type = _Res (_Class::*)(_ArgTypes...)&&;
(std::forward<_Args>(__args)...); using __lvalue = false_type;
} using __rvalue = true_type;
};
template<typename _Tp, typename... _Args>
_Res
_M_call(_Tp&& __ptr, const volatile void *, _Args&&... __args) const
{ return ((*__ptr).*__pmf)(std::forward<_Args>(__args)...); }
template<typename... _Args>
using _RequireValidArgs
= _Require<_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
template<typename _Tp, typename... _Args>
using _RequireValidArgs2
= _Require<_NotSame<_Class, _Tp>, _NotSame<volatile _Class*, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
template<typename _Tp, typename... _Args>
using _RequireValidArgs3
= _Require<is_base_of<_Class, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
public:
typedef _Res result_type;
explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
// Handle objects template<typename _Res, typename _Class, typename... _ArgTypes>
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) const&&>
_Res : _Mem_fn_traits_base<_Res, const _Class, _ArgTypes...>
operator()(volatile _Class& __object, _Args&&... __args) const {
{ return (__object.*__pmf)(std::forward<_Args>(__args)...); } using __pmf_type = _Res (_Class::*)(_ArgTypes...) const&&;
using __lvalue = false_type;
using __rvalue = true_type;
};
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> template<typename _Res, typename _Class, typename... _ArgTypes>
_Res struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) volatile&&>
operator()(volatile _Class&& __object, _Args&&... __args) const : _Mem_fn_traits_base<_Res, volatile _Class, _ArgTypes...>
{ {
return (std::move(__object).*__pmf)(std::forward<_Args>(__args)...); using __pmf_type = _Res (_Class::*)(_ArgTypes...) volatile&&;
} using __lvalue = false_type;
using __rvalue = true_type;
};
// Handle pointers template<typename _Res, typename _Class, typename... _ArgTypes>
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> struct _Mem_fn_traits<_Res (_Class::*)(_ArgTypes...) const volatile&&>
_Res : _Mem_fn_traits_base<_Res, const volatile _Class, _ArgTypes...>
operator()(volatile _Class* __object, _Args&&... __args) const {
{ return (__object->*__pmf)(std::forward<_Args>(__args)...); } using __pmf_type = _Res (_Class::*)(_ArgTypes...) const volatile&&;
using __lvalue = false_type;
using __rvalue = true_type;
};
// Handle smart pointers, references and pointers to derived template<typename _MemFunPtr,
template<typename _Tp, typename... _Args, bool __is_mem_fn = is_member_function_pointer<_MemFunPtr>::value>
typename _Req = _RequireValidArgs2<_Tp, _Args...>> class _Mem_fn_base
_Res : public _Mem_fn_traits<_MemFunPtr>::__maybe_type
operator()(_Tp&& __object, _Args&&... __args) const
{ {
return _M_call(std::forward<_Tp>(__object), &__object, using _Traits = _Mem_fn_traits<_MemFunPtr>;
std::forward<_Args>(__args)...);
}
template<typename _Tp, typename... _Args, public:
typename _Req = _RequireValidArgs3<_Tp, _Args...>> using result_type = typename _Traits::__result_type;
_Res
operator()(reference_wrapper<_Tp> __ref, _Args&&... __args) const
{ return operator()(__ref.get(), std::forward<_Args>(__args)...); }
private: private:
_Functor __pmf; using _Class = typename _Traits::__class_type;
}; using _ArgTypes = typename _Traits::__arg_types;
using _Pmf = typename _Traits::__pmf_type;
/// Implementation of @c mem_fn for const volatile member function pointers.
template<typename _Res, typename _Class, typename... _ArgTypes>
class _Mem_fn<_Res (_Class::*)(_ArgTypes...) const volatile>
: public _Maybe_unary_or_binary_function<_Res, const volatile _Class*,
_ArgTypes...>
{
typedef _Res (_Class::*_Functor)(_ArgTypes...) const volatile;
template<typename _Tp, typename... _Args> template<typename _Tp, typename... _Args>
_Res result_type
_M_call(_Tp&& __object, const volatile _Class *, _M_call(_Tp&& __object, const volatile _Class *,
_Args&&... __args) const _Args&&... __args) const
{ {
return (std::forward<_Tp>(__object).*__pmf) return (std::forward<_Tp>(__object).*_M_pmf)
(std::forward<_Args>(__args)...); (std::forward<_Args>(__args)...);
} }
template<typename _Tp, typename... _Args> template<typename _Tp, typename... _Args>
_Res result_type
_M_call(_Tp&& __ptr, const volatile void *, _Args&&... __args) const _M_call(_Tp&& __ptr, const volatile void *, _Args&&... __args) const
{ return ((*__ptr).*__pmf)(std::forward<_Args>(__args)...); } { return ((*__ptr).*_M_pmf)(std::forward<_Args>(__args)...); }
// Require each _Args to be convertible to corresponding _ArgTypes
template<typename... _Args> template<typename... _Args>
using _RequireValidArgs using _RequireValidArgs
= _Require<_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>; = _Require<_AllConvertible<_Pack<_Args...>, _ArgTypes>>;
// Require each _Args to be convertible to corresponding _ArgTypes
// and require _Tp is not _Class, _Class& or _Class*
template<typename _Tp, typename... _Args> template<typename _Tp, typename... _Args>
using _RequireValidArgs2 using _RequireValidArgs2
= _Require<_NotSame<_Class, _Tp>, = _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>,
_NotSame<const volatile _Class*, _Tp>, _AllConvertible<_Pack<_Args...>, _ArgTypes>>;
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>;
// Require each _Args to be convertible to corresponding _ArgTypes
// and require _Tp is _Class or derived from _Class
template<typename _Tp, typename... _Args> template<typename _Tp, typename... _Args>
using _RequireValidArgs3 using _RequireValidArgs3
= _Require<is_base_of<_Class, _Tp>, = _Require<is_base_of<_Class, _Tp>,
_AllConvertible<_Pack<_Args...>, _Pack<_ArgTypes...>>>; _AllConvertible<_Pack<_Args...>, _ArgTypes>>;
public: public:
typedef _Res result_type; explicit _Mem_fn_base(_Pmf __pmf) : _M_pmf(__pmf) { }
explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
// Handle objects // Handle objects
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> template<typename... _Args, typename _Req
_Res = _Require<typename _Traits::__lvalue,
operator()(const volatile _Class& __object, _Args&&... __args) const _AllConvertible<_Pack<_Args...>, _ArgTypes>>>
{ return (__object.*__pmf)(std::forward<_Args>(__args)...); } result_type
operator()(_Class& __object, _Args&&... __args) const
{ return (__object.*_M_pmf)(std::forward<_Args>(__args)...); }
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> template<typename... _Args, typename _Req
_Res = _Require<typename _Traits::__rvalue,
operator()(const volatile _Class&& __object, _Args&&... __args) const _AllConvertible<_Pack<_Args...>, _ArgTypes>>>
result_type
operator()(_Class&& __object, _Args&&... __args) const
{ {
return (std::move(__object).*__pmf)(std::forward<_Args>(__args)...); return (std::move(__object).*_M_pmf)(std::forward<_Args>(__args)...);
} }
// Handle pointers // Handle pointers
template<typename... _Args, typename _Req = _RequireValidArgs<_Args...>> template<typename... _Args, typename _Req
_Res = _Require<typename _Traits::__lvalue,
operator()(const volatile _Class* __object, _Args&&... __args) const _AllConvertible<_Pack<_Args...>, _ArgTypes>>>
{ return (__object->*__pmf)(std::forward<_Args>(__args)...); } result_type
operator()(_Class* __object, _Args&&... __args) const
{ return (__object->*_M_pmf)(std::forward<_Args>(__args)...); }
// Handle smart pointers, references and pointers to derived // Handle smart pointers, references and pointers to derived
template<typename _Tp, typename... _Args, // TODO how to constrain to lvalue/rvalue here? constrain _M_call?
typename _Req = _RequireValidArgs2<_Tp, _Args...>> template<typename _Tp, typename... _Args, typename _Req
_Res operator()(_Tp&& __object, _Args&&... __args) const = _Require<_NotSame<_Class, _Tp>, _NotSame<_Class*, _Tp>,
_AllConvertible<_Pack<_Args...>, _ArgTypes>>>
result_type
operator()(_Tp&& __object, _Args&&... __args) const
{ {
return _M_call(std::forward<_Tp>(__object), &__object, return _M_call(std::forward<_Tp>(__object), &__object,
std::forward<_Args>(__args)...); std::forward<_Args>(__args)...);
} }
template<typename _Tp, typename... _Args, // Handle reference wrappers
typename _Req = _RequireValidArgs3<_Tp, _Args...>> template<typename _Tp, typename... _Args, typename _Req
_Res = _Require<is_base_of<_Class, _Tp>,
typename _Traits::__lvalue,
_AllConvertible<_Pack<_Args...>, _ArgTypes>>>
result_type
operator()(reference_wrapper<_Tp> __ref, _Args&&... __args) const operator()(reference_wrapper<_Tp> __ref, _Args&&... __args) const
{ return operator()(__ref.get(), std::forward<_Args>(__args)...); } { return operator()(__ref.get(), std::forward<_Args>(__args)...); }
private: private:
_Functor __pmf; _Pmf _M_pmf;
};
template<typename _Tp, bool>
struct _Mem_fn_const_or_non
{
typedef const _Tp& type;
};
template<typename _Tp>
struct _Mem_fn_const_or_non<_Tp, false>
{
typedef _Tp& type;
}; };
// Partial specialization for member object pointers.
template<typename _Res, typename _Class> template<typename _Res, typename _Class>
class _Mem_fn<_Res _Class::*> class _Mem_fn_base<_Res _Class::*, false>
{ {
using __pm_type = _Res _Class::*; using __pm_type = _Res _Class::*;
...@@ -852,56 +739,56 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) ...@@ -852,56 +739,56 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
auto auto
_M_call(_Tp&& __object, const _Class *) const noexcept _M_call(_Tp&& __object, const _Class *) const noexcept
-> decltype(std::forward<_Tp>(__object).*std::declval<__pm_type&>()) -> decltype(std::forward<_Tp>(__object).*std::declval<__pm_type&>())
{ return std::forward<_Tp>(__object).*__pm; } { return std::forward<_Tp>(__object).*_M_pm; }
template<typename _Tp, typename _Up> template<typename _Tp, typename _Up>
auto auto
_M_call(_Tp&& __object, _Up * const *) const noexcept _M_call(_Tp&& __object, _Up * const *) const noexcept
-> decltype((*std::forward<_Tp>(__object)).*std::declval<__pm_type&>()) -> decltype((*std::forward<_Tp>(__object)).*std::declval<__pm_type&>())
{ return (*std::forward<_Tp>(__object)).*__pm; } { return (*std::forward<_Tp>(__object)).*_M_pm; }
template<typename _Tp> template<typename _Tp>
auto auto
_M_call(_Tp&& __ptr, const volatile void*) const _M_call(_Tp&& __ptr, const volatile void*) const
noexcept(noexcept((*__ptr).*std::declval<__pm_type&>())) noexcept(noexcept((*__ptr).*std::declval<__pm_type&>()))
-> decltype((*__ptr).*std::declval<__pm_type&>()) -> decltype((*__ptr).*std::declval<__pm_type&>())
{ return (*__ptr).*__pm; } { return (*__ptr).*_M_pm; }
public: public:
explicit explicit
_Mem_fn(_Res _Class::*__pm) noexcept : __pm(__pm) { } _Mem_fn_base(_Res _Class::*__pm) noexcept : _M_pm(__pm) { }
// Handle objects // Handle objects
_Res& _Res&
operator()(_Class& __object) const noexcept operator()(_Class& __object) const noexcept
{ return __object.*__pm; } { return __object.*_M_pm; }
const _Res& const _Res&
operator()(const _Class& __object) const noexcept operator()(const _Class& __object) const noexcept
{ return __object.*__pm; } { return __object.*_M_pm; }
_Res&& _Res&&
operator()(_Class&& __object) const noexcept operator()(_Class&& __object) const noexcept
{ return std::forward<_Class>(__object).*__pm; } { return std::forward<_Class>(__object).*_M_pm; }
const _Res&& const _Res&&
operator()(const _Class&& __object) const noexcept operator()(const _Class&& __object) const noexcept
{ return std::forward<const _Class>(__object).*__pm; } { return std::forward<const _Class>(__object).*_M_pm; }
// Handle pointers // Handle pointers
_Res& _Res&
operator()(_Class* __object) const noexcept operator()(_Class* __object) const noexcept
{ return __object->*__pm; } { return __object->*_M_pm; }
const _Res& const _Res&
operator()(const _Class* __object) const noexcept operator()(const _Class* __object) const noexcept
{ return __object->*__pm; } { return __object->*_M_pm; }
// Handle smart pointers and derived // Handle smart pointers and derived
template<typename _Tp, typename _Req = _Require<_NotSame<_Class*, _Tp>>> template<typename _Tp, typename _Req = _Require<_NotSame<_Class*, _Tp>>>
auto auto
operator()(_Tp&& __unknown) const operator()(_Tp&& __unknown) const
noexcept(noexcept(std::declval<_Mem_fn*>()->_M_call noexcept(noexcept(std::declval<_Mem_fn_base*>()->_M_call
(std::forward<_Tp>(__unknown), &__unknown))) (std::forward<_Tp>(__unknown), &__unknown)))
-> decltype(this->_M_call(std::forward<_Tp>(__unknown), &__unknown)) -> decltype(this->_M_call(std::forward<_Tp>(__unknown), &__unknown))
{ return _M_call(std::forward<_Tp>(__unknown), &__unknown); } { return _M_call(std::forward<_Tp>(__unknown), &__unknown); }
...@@ -909,12 +796,19 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) ...@@ -909,12 +796,19 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
template<typename _Tp, typename _Req = _Require<is_base_of<_Class, _Tp>>> template<typename _Tp, typename _Req = _Require<is_base_of<_Class, _Tp>>>
auto auto
operator()(reference_wrapper<_Tp> __ref) const operator()(reference_wrapper<_Tp> __ref) const
noexcept(noexcept(std::declval<_Mem_fn&>()(__ref.get()))) noexcept(noexcept(std::declval<_Mem_fn_base&>()(__ref.get())))
-> decltype((*this)(__ref.get())) -> decltype((*this)(__ref.get()))
{ return (*this)(__ref.get()); } { return (*this)(__ref.get()); }
private: private:
_Res _Class::*__pm; _Res _Class::*_M_pm;
};
template<typename _Res, typename _Class>
struct _Mem_fn<_Res _Class::*>
: _Mem_fn_base<_Res _Class::*>
{
using _Mem_fn_base<_Res _Class::*>::_Mem_fn_base;
}; };
// _GLIBCXX_RESOLVE_LIB_DEFECTS // _GLIBCXX_RESOLVE_LIB_DEFECTS
......
libstdc++-v3/testsuite/20_util/function_objects/mem_fn/refqual.cc 0 → 100644
// Copyright (C) 2014 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11" }
// { dg-do compile }
#include <functional>
struct Foo
{
void r()&& { }
int l() const& { return 0; }
};
void test01()
{
Foo f;
int i = std::mem_fn(&Foo::l)( f );
std::mem_fn(&Foo::r)( std::move(f) );
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment