feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

function_template.hpp: Works around an annoying bug in one of Apple's

Browse Source 
3.3 compilers.


[SVN r20233]
This commit is contained in:
Douglas Gregor
2003-10-01 03:40:35 +00:00
parent 5314836215
commit fad40732a9
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,7 @@ namespace boost {
if (this->empty()) if (this->empty())
boost::throw_exception(bad_function_call()); boost::throw_exception(bad_function_call());
internal_result_type result = invoker(function_base::functor internal_result_type result = invoker(this->functor
BOOST_FUNCTION_COMMA BOOST_FUNCTION_COMMA
BOOST_FUNCTION_ARGS); BOOST_FUNCTION_ARGS);
@ -379,21 +379,20 @@ namespace boost {
if (&other == this) if (&other == this)
return; return;
std::swap(function_base::manager, other.manager); std::swap(this->manager, other.manager);
std::swap(function_base::functor, other.functor); std::swap(this->functor, other.functor);
std::swap(invoker, other.invoker); std::swap(invoker, other.invoker);
} }
// Clear out a target, if there is one // Clear out a target, if there is one
void clear() void clear()
{ {
if (function_base::manager) { if (this->manager) {
function_base::functor = function_base::functor =
function_base::manager(function_base::functor, this->manager(this->functor, detail::function::destroy_functor_tag);
detail::function::destroy_functor_tag);
} }
function_base::manager = 0; this->manager = 0;
invoker = 0; invoker = 0;
} }
@ -421,8 +420,8 @@ namespace boost {
{ {
if (!f.empty()) { if (!f.empty()) {
invoker = f.invoker; invoker = f.invoker;
function_base::manager = f.manager; this->manager = f.manager;
function_base::functor = this->functor =
f.manager(f.functor, detail::function::clone_functor_tag); f.manager(f.functor, detail::function::clone_functor_tag);
} }
} }
@ -448,10 +447,10 @@ namespace boost {
invoker_type; invoker_type;
invoker = &invoker_type::invoke; invoker = &invoker_type::invoke;
function_base::manager = this->manager =
&detail::function::functor_manager<FunctionPtr, Allocator>::manage; &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
function_base::functor = this->functor =
function_base::manager(detail::function::make_any_pointer( this->manager(detail::function::make_any_pointer(
// should be a reinterpret cast, but some compilers // should be a reinterpret cast, but some compilers
// insist on giving cv-qualifiers to free functions // insist on giving cv-qualifiers to free functions
(void (*)())(f) (void (*)())(f)
@ -481,7 +480,7 @@ namespace boost {
invoker_type; invoker_type;
invoker = &invoker_type::invoke; invoker = &invoker_type::invoke;
function_base::manager = &detail::function::functor_manager< this->manager = &detail::function::functor_manager<
FunctionObj, Allocator>::manage; FunctionObj, Allocator>::manage;
#ifndef BOOST_NO_STD_ALLOCATOR #ifndef BOOST_NO_STD_ALLOCATOR
typedef typename Allocator::template rebind<FunctionObj>::other typedef typename Allocator::template rebind<FunctionObj>::other
@ -496,7 +495,7 @@ namespace boost {
#else #else
FunctionObj* new_f = new FunctionObj(f); FunctionObj* new_f = new FunctionObj(f);
#endif // BOOST_NO_STD_ALLOCATOR #endif // BOOST_NO_STD_ALLOCATOR
function_base::functor = this->functor =
detail::function::make_any_pointer(static_cast<void*>(new_f)); detail::function::make_any_pointer(static_cast<void*>(new_f));
} }
} }
@ -515,9 +514,9 @@ namespace boost {
invoker_type; invoker_type;
invoker = &invoker_type::invoke; invoker = &invoker_type::invoke;
function_base::manager = &detail::function::trivial_manager; this->manager = &detail::function::trivial_manager;
function_base::functor = this->functor =
function_base::manager( this->manager(
detail::function::make_any_pointer( detail::function::make_any_pointer(
const_cast<FunctionObj*>(f.get_pointer())), const_cast<FunctionObj*>(f.get_pointer())),
detail::function::clone_functor_tag); detail::function::clone_functor_tag);
@ -536,8 +535,8 @@ namespace boost {
>::type >::type
invoker_type; invoker_type;
invoker = &invoker_type::invoke; invoker = &invoker_type::invoke;
function_base::manager = &detail::function::trivial_manager; this->manager = &detail::function::trivial_manager;
function_base::functor = detail::function::make_any_pointer(this); this->functor = detail::function::make_any_pointer(this);
} }
typedef internal_result_type (*invoker_type)(detail::function::any_pointer typedef internal_result_type (*invoker_type)(detail::function::any_pointer