boostorg/function
1
0
Fork 1
mirror of https://github.com/boostorg/function.git synced 2025-07-23 01:17:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts in 1.28.0 merge

Browse Source 
[SVN r13946]
This commit is contained in:
Douglas Gregor
2002-05-16 02:18:29 +00:00
parent e975d1e0c2
commit d50e9729ea
3 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/function/function_base.hpp
View File

@ -307,13 +307,13 @@ namespace boost {
public: // should be protected, but GCC 2.95.3 will fail to allow access
detail::function::any_pointer (*manager)(
detail::function::any_pointer,
detail::function::functor_manager_operation_type);
detail::function::any_pointer functor;
#if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
// Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
operator bool () const { return !this->empty(); }
#else
detail::function::functor_manager_operation_type);
detail::function::any_pointer functor;
private:
struct dummy {
void nonnull() {};
@ -324,10 +324,10 @@ namespace boost {
public:
operator safe_bool () const
{ return (this->empty())? 0 : &dummy::nonnull; }
#endif
safe_bool operator!() const
{ return (this->empty())? &dummy::nonnull : 0; }
#endif
};
/* Poison comparison between Boost.Function objects (because it is
@ -341,20 +341,14 @@ namespace boost {
namespace detail {
namespace function {
// The result is not a Boost.Function object, so we assume that this
// target is not empty
template<typename FunctionObj>
inline bool has_empty_target(const FunctionObj&, truth<false>)
inline bool has_empty_target(const function_base* f)
{
return false;
return f->empty();
}
// The result is a Boost.Function object, so query whether it is empty
// or not
template<typename FunctionObj>
inline bool has_empty_target(const FunctionObj& f, truth<true>)
{
return f.empty();
inline bool has_empty_target(...)
{
return false;
}
} // end namespace function
} // end namespace detail

12
include/boost/function/function_template.hpp
View File

@ -425,11 +425,7 @@ namespace boost {
template<typename FunctionObj>
void assign_to(FunctionObj f, detail::function::function_obj_tag)
{
typedef detail::function::truth<
boost::is_base_and_derived<function_base, FunctionObj>::value>
is_boost_function;
if (!detail::function::has_empty_target(f, is_boost_function())) {
if (!detail::function::has_empty_target(addressof(f))) {
typedef
typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
FunctionObj,
@ -463,11 +459,7 @@ namespace boost {
void assign_to(const reference_wrapper<FunctionObj>& f,
detail::function::function_obj_ref_tag)
{
typedef detail::function::truth<
boost::is_base_and_derived<function_base, FunctionObj>::value>
is_boost_function;
if (!detail::function::has_empty_target(f.get(), is_boost_function())) {
if (!detail::function::has_empty_target(f.get_pointer())) {
typedef
typename detail::function::BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER<
FunctionObj,