diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2017-11-27 23:47:54 +0300 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2017-11-27 23:47:54 +0300 |
commit | a2f3c63282330be0226158cdfdc27c4c2aef9cdc (patch) | |
tree | fa4b0da60615e2de7446273c45734f524c78bf04 /libcxx/test | |
parent | 3f2921f5ec96df28a23bdef8b50da81647a6ef57 (diff) |
Revert commit removing allocator support from packaged_task. Will investigate further
llvm-svn: 319091
Diffstat (limited to 'libcxx/test')
-rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp | 34 | ||||
-rw-r--r-- | libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp | 3 |
2 files changed, 37 insertions, 0 deletions
diff --git a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp new file mode 100644 index 000000000000..212a12084e79 --- /dev/null +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp @@ -0,0 +1,34 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// UNSUPPORTED: libcpp-has-no-threads +// UNSUPPORTED: c++98, c++03 + +// <future> + +// class packaged_task<R(ArgTypes...)> +// template <class F, class Allocator> +// packaged_task(allocator_arg_t, const Allocator& a, F&& f); +// These constructors shall not participate in overload resolution if +// decay<F>::type is the same type as std::packaged_task<R(ArgTypes...)>. + +#include <future> +#include <cassert> + +#include "test_allocator.h" + +struct A {}; +typedef std::packaged_task<A(int, char)> PT; +typedef volatile std::packaged_task<A(int, char)> VPT; + +int main() +{ + PT p { std::allocator_arg_t{}, test_allocator<A>{}, VPT {}}; // expected-error {{no matching constructor for initialization of 'PT' (aka 'packaged_task<A (int, char)>')}} + // expected-note-re@future:* 1 {{candidate template ignored: {{(disabled by 'enable_if')|(requirement '.*' was not satisfied)}}}} +} diff --git a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp index 1feda977cd4f..14b29715ef4f 100644 --- a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp @@ -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> |