forked from boostorg/function
Fix some shadow warnings
[SVN r22670]
This commit is contained in:
@ -438,9 +438,9 @@ namespace boost {
|
|||||||
R BOOST_FUNCTION_COMMA
|
R BOOST_FUNCTION_COMMA
|
||||||
BOOST_FUNCTION_TEMPLATE_ARGS
|
BOOST_FUNCTION_TEMPLATE_ARGS
|
||||||
>::type
|
>::type
|
||||||
invoker_type;
|
actual_invoker_type;
|
||||||
|
|
||||||
invoker = &invoker_type::invoke;
|
invoker = &actual_invoker_type::invoke;
|
||||||
this->manager =
|
this->manager =
|
||||||
&detail::function::functor_manager<FunctionPtr, Allocator>::manage;
|
&detail::function::functor_manager<FunctionPtr, Allocator>::manage;
|
||||||
this->functor =
|
this->functor =
|
||||||
@ -471,16 +471,16 @@ namespace boost {
|
|||||||
R BOOST_FUNCTION_COMMA
|
R BOOST_FUNCTION_COMMA
|
||||||
BOOST_FUNCTION_TEMPLATE_ARGS
|
BOOST_FUNCTION_TEMPLATE_ARGS
|
||||||
>::type
|
>::type
|
||||||
invoker_type;
|
actual_invoker_type;
|
||||||
|
|
||||||
invoker = &invoker_type::invoke;
|
invoker = &actual_invoker_type::invoke;
|
||||||
this->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
|
||||||
allocator_type;
|
rebound_allocator_type;
|
||||||
typedef typename allocator_type::pointer pointer_type;
|
typedef typename rebound_allocator_type::pointer pointer_type;
|
||||||
allocator_type allocator;
|
rebound_allocator_type allocator;
|
||||||
pointer_type copy = allocator.allocate(1);
|
pointer_type copy = allocator.allocate(1);
|
||||||
allocator.construct(copy, f);
|
allocator.construct(copy, f);
|
||||||
|
|
||||||
@ -505,9 +505,9 @@ namespace boost {
|
|||||||
R BOOST_FUNCTION_COMMA
|
R BOOST_FUNCTION_COMMA
|
||||||
BOOST_FUNCTION_TEMPLATE_ARGS
|
BOOST_FUNCTION_TEMPLATE_ARGS
|
||||||
>::type
|
>::type
|
||||||
invoker_type;
|
actual_invoker_type;
|
||||||
|
|
||||||
invoker = &invoker_type::invoke;
|
invoker = &actual_invoker_type::invoke;
|
||||||
this->manager = &detail::function::trivial_manager<FunctionObj>::get;
|
this->manager = &detail::function::trivial_manager<FunctionObj>::get;
|
||||||
this->functor =
|
this->functor =
|
||||||
this->manager(
|
this->manager(
|
||||||
@ -527,8 +527,8 @@ namespace boost {
|
|||||||
R BOOST_FUNCTION_COMMA
|
R BOOST_FUNCTION_COMMA
|
||||||
BOOST_FUNCTION_TEMPLATE_ARGS
|
BOOST_FUNCTION_TEMPLATE_ARGS
|
||||||
>::type
|
>::type
|
||||||
invoker_type;
|
actual_invoker_type;
|
||||||
invoker = &invoker_type::invoke;
|
invoker = &actual_invoker_type::invoke;
|
||||||
this->manager = &detail::function::trivial_manager<FunctionObj>::get;
|
this->manager = &detail::function::trivial_manager<FunctionObj>::get;
|
||||||
this->functor = detail::function::make_any_pointer(this);
|
this->functor = detail::function::make_any_pointer(this);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user