boostorg/bind
1
0
Fork 1
mirror of https://github.com/boostorg/bind.git synced 2025-07-31 21:34:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor _bi::dm_result<> to not form references to functions. Fixes #35.

Browse Source
This commit is contained in:
Peter Dimov
2024-07-09 20:24:19 +03:00
parent cb724dcf57
commit 769479a964
1 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/boost/bind/bind.hpp
View File

@@ -737,44 +737,18 @@ template<class F, class... A>
namespace _bi namespace _bi
{ {
template< class Pm, int I > struct add_cref; template<class M, int I> struct add_cref;
template< class M, class T > struct add_cref< M T::*, 0 > template<class M> struct add_cref<M, 0>
{ {
typedef M type; typedef M type;
}; };
template< class M, class T > struct add_cref< M T::*, 1 > template<class M> struct add_cref<M, 1>
{ {
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable:4180)
#endif
typedef M const& type; typedef M const& type;
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
}; };
template< class R, class T > struct add_cref< R (T::*) (), 1 >
{
typedef void type;
};
template< class R, class T > struct add_cref< R (T::*) () const, 1 >
{
typedef void type;
};
#if defined( __cpp_noexcept_function_type ) || defined( _NOEXCEPT_TYPES_SUPPORTED )
template< class R, class T > struct add_cref< R (T::*) () const noexcept, 1 >
{
typedef void type;
};
#endif // __cpp_noexcept_function_type
template<class R> struct isref template<class R> struct isref
{ {
enum value_type { value = 0 }; enum value_type { value = 0 };
@@ -790,15 +764,19 @@ template<class R> struct isref< R* >
enum value_type { value = 1 }; enum value_type { value = 1 };
}; };
template<class Pm, class A1> struct dm_result template<class M, class A1, bool fn = std::is_function<M>::value> struct dm_result
{ {
typedef typename add_cref< Pm, 1 >::type type;
}; };
template<class Pm, class R, class F, class L> struct dm_result< Pm, bind_t<R, F, L> > template<class M, class A1> struct dm_result<M, A1, false>
{
typedef typename add_cref< M, 1 >::type type;
};
template<class M, class R, class F, class L> struct dm_result<M, bind_t<R, F, L>, false>
{ {
typedef typename bind_t<R, F, L>::result_type result_type; typedef typename bind_t<R, F, L>::result_type result_type;
typedef typename add_cref< Pm, isref< result_type >::value >::type type; typedef typename add_cref< M, isref< result_type >::value >::type type;
}; };
} // namespace _bi } // namespace _bi
@@ -806,14 +784,14 @@ template<class Pm, class R, class F, class L> struct dm_result< Pm, bind_t<R, F,
template<class A1, class M, class T> template<class A1, class M, class T>
_bi::bind_t< _bi::bind_t<
typename _bi::dm_result< M T::*, A1 >::type, typename _bi::dm_result<M, A1>::type,
_mfi::dm<M, T>, _mfi::dm<M, T>,
typename _bi::list_av<A1>::type typename _bi::list_av<A1>::type
> >
BOOST_BIND( M T::*f, A1 a1 ) BOOST_BIND( M T::*f, A1 a1 )
{ {
typedef typename _bi::dm_result< M T::*, A1 >::type result_type; typedef typename _bi::dm_result<M, A1>::type result_type;
typedef _mfi::dm<M, T> F; typedef _mfi::dm<M, T> F;
typedef typename _bi::list_av<A1>::type list_type; typedef typename _bi::list_av<A1>::type list_type;
return _bi::bind_t< result_type, F, list_type >( F( f ), list_type( a1 ) ); return _bi::bind_t< result_type, F, list_type >( F( f ), list_type( a1 ) );