Author: marshall Date: Mon Nov 27 12:47:54 2017 New Revision: 319091 URL: http://llvm.org/viewvc/llvm-project?rev=319091&view=rev Log: Revert commit removing allocator support from packaged_task. Will investigate further
Added: libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp - copied unchanged from r319079, libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp Modified: libcxx/trunk/include/future libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp Modified: libcxx/trunk/include/future URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/future?rev=319091&r1=319090&r2=319091&view=diff ============================================================================== --- libcxx/trunk/include/future (original) +++ libcxx/trunk/include/future Mon Nov 27 12:47:54 2017 @@ -328,6 +328,8 @@ public: packaged_task() noexcept; template <class F> explicit packaged_task(F&& f); + template <class F, class Allocator> + packaged_task(allocator_arg_t, const Allocator& a, F&& f); ~packaged_task(); // no copy @@ -354,6 +356,8 @@ public: template <class R> void swap(packaged_task<R(ArgTypes...)&, packaged_task<R(ArgTypes...)>&) noexcept; +template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>; + } // std */ @@ -2024,6 +2028,19 @@ public: > _LIBCPP_INLINE_VISIBILITY explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {} + template <class _Fp, class _Allocator, + class = typename enable_if + < + !is_same< + typename decay<_Fp>::type, + packaged_task + >::value + >::type + > + _LIBCPP_INLINE_VISIBILITY + packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f) + : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)), + __p_(allocator_arg, __a) {} // ~packaged_task() = default; // no copy @@ -2140,6 +2157,19 @@ public: > _LIBCPP_INLINE_VISIBILITY explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {} + template <class _Fp, class _Allocator, + class = typename enable_if + < + !is_same< + typename decay<_Fp>::type, + packaged_task + >::value + >::type + > + _LIBCPP_INLINE_VISIBILITY + packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f) + : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)), + __p_(allocator_arg, __a) {} // ~packaged_task() = default; // no copy @@ -2241,6 +2271,10 @@ swap(packaged_task<_Callable>& __x, pack __x.swap(__y); } +template <class _Callable, class _Alloc> +struct _LIBCPP_TEMPLATE_VIS uses_allocator<packaged_task<_Callable>, _Alloc> + : public true_type {}; + template <class _Rp, class _Fp> future<_Rp> #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES Modified: libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp?rev=319091&r1=319090&r2=319091&view=diff ============================================================================== --- libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp (original) +++ libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp Mon Nov 27 12:47:54 2017 @@ -16,6 +16,9 @@ // class packaged_task<R(ArgTypes...)> +// template <class F, class Allocator> +// explicit packaged_task(allocator_arg_t, const Allocator& a, F&& f); + #include <future> #include <cassert> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits