From 468e815d3a6760f84b53926d35c5a77fd71aae83 Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Wed, 16 Dec 2015 22:08:47 +0100 Subject: [PATCH] fix usage of disable_overload --- include/boost/fiber/context.hpp | 4 +--- include/boost/fiber/fiber.hpp | 3 +-- include/boost/fiber/future/packaged_task.hpp | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/boost/fiber/context.hpp b/include/boost/fiber/context.hpp index 4da6018d..67dc40f3 100644 --- a/include/boost/fiber/context.hpp +++ b/include/boost/fiber/context.hpp @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -278,8 +277,7 @@ public: // worker fiber context template< typename StackAlloc, typename Fn, - typename Tpl, - typename = detail::disable_overload< context, Fn > + typename Tpl > context( worker_context_t, boost::context::preallocated palloc, StackAlloc salloc, diff --git a/include/boost/fiber/fiber.hpp b/include/boost/fiber/fiber.hpp index f1ef5f67..73c88208 100644 --- a/include/boost/fiber/fiber.hpp +++ b/include/boost/fiber/fiber.hpp @@ -56,8 +56,7 @@ public: template< typename StackAllocator, typename Fn, - typename ... Args, - typename = detail::disable_overload< fiber, Fn > + typename ... Args > fiber( std::allocator_arg_t, StackAllocator salloc, Fn && fn, Args && ... args) : impl_{ make_worker_context( salloc, std::forward< Fn >( fn), std::forward< Args >( args) ... ) } { diff --git a/include/boost/fiber/future/packaged_task.hpp b/include/boost/fiber/future/packaged_task.hpp index 1d90d156..b44bfebf 100644 --- a/include/boost/fiber/future/packaged_task.hpp +++ b/include/boost/fiber/future/packaged_task.hpp @@ -48,8 +48,7 @@ public: } template< typename Fn, - typename Allocator, - typename = detail::disable_overload< packaged_task, Fn > + typename Allocator > explicit packaged_task( std::allocator_arg_t, Allocator const& alloc, Fn && fn) { typedef detail::task_object<