boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-02 08:52:07 +00:00
Code Issues Projects Releases Wiki Activity

fixes for MSVC

Browse Source
This commit is contained in:
Oliver Kowalke
2014-07-13 20:35:15 +02:00
parent 161e9c73fc
commit 07f394a1b4
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/fiber/fiber.hpp
View File

@@ -81,7 +81,7 @@ public:
impl_()
{
coro_t::call_type coro( detail::trampoline< fiber_fn >, attrs, stack_alloc);
detail::setup< fiber_fn > s( fn, & coro);
detail::setup< fiber_fn > s( forward< fiber_fn >( fn), & coro);
impl_.reset( s.allocate() );
BOOST_ASSERT( impl_);
@@ -94,7 +94,7 @@ public:
impl_()
{
typename coro_t::call_type coro( detail::trampoline< fiber_fn >, attrs, stack_alloc);
detail::setup< fiber_fn > s( fn, & coro);
detail::setup< fiber_fn > s( forward< fiber_fn >( fn), & coro);
impl_.reset( s.allocate() );
BOOST_ASSERT( impl_);

2
include/boost/fiber/future/detail/task_object.hpp
View File

@@ -84,7 +84,7 @@ public:
>::other allocator_t;
#ifdef BOOST_NO_RVALUE_REFERENCES
task_object( Fn const& fn, allocator_t const& alloc) :
task_object( Fn fn, allocator_t const& alloc) :
task_base< void >(),
fn_( fn),
alloc_( alloc)

18
include/boost/fiber/future/packaged_task.hpp
View File

@@ -72,16 +72,16 @@ public:
//TODO: constructs a std::packaged_task object
// with a shared state and a copy of the task,
// initialized with forward< Fn >( fn)
detail::task_object<
typedef detail::task_object<
task_fn,
std::allocator< packaged_task< R() > >,
R
> object_t;
std::allocator< packaged_task< R() > > alloc;
object_t::allocator_t a( alloc);
typename object_t::allocator_t a( alloc);
task_ = ptr_t(
// placement new
::new( a.allocate( 1) ) object_t( fn, a) );
::new( a.allocate( 1) ) object_t( forward< task_fn >( fn), a) );
}
template< typename Allocator >
@@ -102,7 +102,7 @@ public:
typename object_t::allocator_t a( alloc);
task_ = ptr_t(
// placement new
::new( a.allocate( 1) ) object_t( fn, a) );
::new( a.allocate( 1) ) object_t( forward< task_fn >( fn), a) );
}
#endif
@@ -312,7 +312,7 @@ public:
}
#ifdef BOOST_MSVC
typedef void ( * task_fn)();
typedef void( * task_fn)();
explicit packaged_task( task_fn fn) :
obtained_( false),
@@ -321,16 +321,16 @@ public:
//TODO: constructs a std::packaged_task object
// with a shared state and a copy of the task,
// initialized with forward< Fn >( fn)
detail::task_object<
typedef detail::task_object<
task_fn,
std::allocator< packaged_task< void() > >,
void
> object_t;
std::allocator< packaged_task< void() > > alloc;
object_t::allocator_t a( alloc);
typename object_t::allocator_t a( alloc);
task_ = ptr_t(
// placement new
::new( a.allocate( 1) ) object_t( fn, a) );
::new( a.allocate( 1) ) object_t( forward< task_fn >( fn), a) );
}
template< typename Allocator >
@@ -351,7 +351,7 @@ public:
typename object_t::allocator_t a( alloc);
task_ = ptr_t(
// placement new
::new( a.allocate( 1) ) object_t( fn, a) );
::new( a.allocate( 1) ) object_t( forward< task_fn >( fn), a) );
}
#endif