diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2017-11-27 22:43:28 +0300 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2017-11-27 22:43:28 +0300 |
commit | d42db7e083ee0edda327782aa122ad6474c126d1 (patch) | |
tree | 9ec9fb88971be3a5a09932108b20769866350339 /libcxx/test/std | |
parent | 0b49f9e4893bcf956fa025900855cbd317b55285 (diff) |
Implement LWG#2921 and LWG#2976 - removing allocator support from packaged_task.
llvm-svn: 319080
Diffstat (limited to 'libcxx/test/std')
-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, 0 insertions, 37 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 deleted file mode 100644 index 212a12084e79..000000000000 --- a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor2.fail.cpp +++ /dev/null @@ -1,34 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// 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 14b29715ef4f..1feda977cd4f 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,9 +16,6 @@ // 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> |