diff options
Diffstat (limited to 'libcxx/test')
18 files changed, 37 insertions, 695 deletions
diff --git a/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp deleted file mode 100644 index 8c3731c649b..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/copy_assign.pass.cpp +++ /dev/null @@ -1,74 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// atomic_future& operator=(const atomic_future& rhs); - -#include <future> -#include <cassert> - -int main() -{ -#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES - { - typedef int T; - std::promise<T> p; - std::atomic_future<T> f0 = p.get_future(); - std::atomic_future<T> f; - f = f0; - assert(f0.valid()); - assert(f.valid()); - } - { - typedef int T; - std::atomic_future<T> f0; - std::atomic_future<T> f; - f = f0; - assert(!f0.valid()); - assert(!f.valid()); - } - { - typedef int& T; - std::promise<T> p; - std::atomic_future<T> f0 = p.get_future(); - std::atomic_future<T> f; - f = f0; - assert(f0.valid()); - assert(f.valid()); - } - { - typedef int& T; - std::atomic_future<T> f0; - std::atomic_future<T> f; - f = f0; - assert(!f0.valid()); - assert(!f.valid()); - } - { - typedef void T; - std::promise<T> p; - std::atomic_future<T> f0 = p.get_future(); - std::atomic_future<T> f; - f = f0; - assert(f0.valid()); - assert(f.valid()); - } - { - typedef void T; - std::atomic_future<T> f0; - std::atomic_future<T> f; - f = f0; - assert(!f0.valid()); - assert(!f.valid()); - } -#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/copy_ctor.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/copy_ctor.pass.cpp deleted file mode 100644 index c982153d02d..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/copy_ctor.pass.cpp +++ /dev/null @@ -1,66 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// atomic_future(const atomic_future& rhs); - -#include <future> -#include <cassert> - -int main() -{ - { - typedef int T; - std::promise<T> p; - std::atomic_future<T> f0 = p.get_future(); - std::atomic_future<T> f = f0; - assert(f0.valid()); - assert(f.valid()); - } - { - typedef int T; - std::atomic_future<T> f0; - std::atomic_future<T> f = f0; - assert(!f0.valid()); - assert(!f.valid()); - } - { - typedef int& T; - std::promise<T> p; - std::atomic_future<T> f0 = p.get_future(); - std::atomic_future<T> f = f0; - assert(f0.valid()); - assert(f.valid()); - } - { - typedef int& T; - std::atomic_future<T> f0; - std::atomic_future<T> f = std::move(f0); - assert(!f0.valid()); - assert(!f.valid()); - } - { - typedef void T; - std::promise<T> p; - std::atomic_future<T> f0 = p.get_future(); - std::atomic_future<T> f = f0; - assert(f0.valid()); - assert(f.valid()); - } - { - typedef void T; - std::atomic_future<T> f0; - std::atomic_future<T> f = f0; - assert(!f0.valid()); - assert(!f.valid()); - } -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/default.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/default.pass.cpp deleted file mode 100644 index 6eec60b097e..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/default.pass.cpp +++ /dev/null @@ -1,33 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// atomic_future(); - -#include <future> -#include <cassert> - -int main() -{ - { - std::atomic_future<int> f; - assert(!f.valid()); - } - { - std::atomic_future<int&> f; - assert(!f.valid()); - } - { - std::atomic_future<void> f; - assert(!f.valid()); - } -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/dtor.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/dtor.pass.cpp deleted file mode 100644 index ea4b54252d9..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/dtor.pass.cpp +++ /dev/null @@ -1,66 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// ~atomic_future(); - -#include <future> -#include <cassert> - -#include "../test_allocator.h" - -int main() -{ - assert(test_alloc_base::count == 0); - { - typedef int T; - std::atomic_future<T> f; - { - std::promise<T> p(std::allocator_arg, test_allocator<T>()); - assert(test_alloc_base::count == 1); - f = p.get_future(); - assert(test_alloc_base::count == 1); - assert(f.valid()); - } - assert(test_alloc_base::count == 1); - assert(f.valid()); - } - assert(test_alloc_base::count == 0); - { - typedef int& T; - std::atomic_future<T> f; - { - std::promise<T> p(std::allocator_arg, test_allocator<int>()); - assert(test_alloc_base::count == 1); - f = p.get_future(); - assert(test_alloc_base::count == 1); - assert(f.valid()); - } - assert(test_alloc_base::count == 1); - assert(f.valid()); - } - assert(test_alloc_base::count == 0); - { - typedef void T; - std::atomic_future<T> f; - { - std::promise<T> p(std::allocator_arg, test_allocator<T>()); - assert(test_alloc_base::count == 1); - f = p.get_future(); - assert(test_alloc_base::count == 1); - assert(f.valid()); - } - assert(test_alloc_base::count == 1); - assert(f.valid()); - } - assert(test_alloc_base::count == 0); -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/get.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/get.pass.cpp deleted file mode 100644 index 5ca5408f74b..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/get.pass.cpp +++ /dev/null @@ -1,143 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// const R& atomic_future::get(); -// R& atomic_future<R&>::get(); -// void atomic_future<void>::get(); - -#include <future> -#include <cassert> - -void func1(std::promise<int>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_value(3); -} - -void func2(std::promise<int>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_exception(std::make_exception_ptr(3)); -} - -int j = 0; - -void func3(std::promise<int&>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - j = 5; - p.set_value(j); -} - -void func4(std::promise<int&>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_exception(std::make_exception_ptr(3.5)); -} - -void func5(std::promise<void>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_value(); -} - -void func6(std::promise<void>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_exception(std::make_exception_ptr('c')); -} - -int main() -{ - { - typedef int T; - { - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func1, std::move(p)).detach(); - assert(f.valid()); - assert(f.get() == 3); - assert(f.valid()); - } - { - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func2, std::move(p)).detach(); - try - { - assert(f.valid()); - assert(f.get() == 3); - assert(false); - } - catch (int i) - { - assert(i == 3); - } - assert(f.valid()); - } - } - { - typedef int& T; - { - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func3, std::move(p)).detach(); - assert(f.valid()); - assert(f.get() == 5); - assert(f.valid()); - } - { - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func4, std::move(p)).detach(); - try - { - assert(f.valid()); - assert(f.get() == 3); - assert(false); - } - catch (double i) - { - assert(i == 3.5); - } - assert(f.valid()); - } - } - { - typedef void T; - { - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func5, std::move(p)).detach(); - assert(f.valid()); - f.get(); - assert(f.valid()); - } - { - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func6, std::move(p)).detach(); - try - { - assert(f.valid()); - f.get(); - assert(false); - } - catch (char i) - { - assert(i == 'c'); - } - assert(f.valid()); - } - } -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/wait.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/wait.pass.cpp deleted file mode 100644 index a2e52885555..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/wait.pass.cpp +++ /dev/null @@ -1,86 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// void wait() const; - -#include <future> -#include <cassert> - -void func1(std::promise<int>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_value(3); -} - -int j = 0; - -void func3(std::promise<int&>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - j = 5; - p.set_value(j); -} - -void func5(std::promise<void>& p) -{ - std::this_thread::sleep_for(std::chrono::milliseconds(500)); - p.set_value(); -} - -int main() -{ - typedef std::chrono::high_resolution_clock Clock; - typedef std::chrono::duration<double, std::milli> ms; - { - typedef int T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func1, std::move(p)).detach(); - assert(f.valid()); - f.wait(); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } - { - typedef int& T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func3, std::move(p)).detach(); - assert(f.valid()); - f.wait(); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } - { - typedef void T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func5, std::move(p)).detach(); - assert(f.valid()); - f.wait(); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/wait_for.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/wait_for.pass.cpp deleted file mode 100644 index ce5407cb3d4..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/wait_for.pass.cpp +++ /dev/null @@ -1,95 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// template <class Rep, class Period> -// future_status -// wait_for(const chrono::duration<Rep, Period>& rel_time) const; - -#include <future> -#include <cassert> - -typedef std::chrono::milliseconds ms; - -void func1(std::promise<int>& p) -{ - std::this_thread::sleep_for(ms(500)); - p.set_value(3); -} - -int j = 0; - -void func3(std::promise<int&>& p) -{ - std::this_thread::sleep_for(ms(500)); - j = 5; - p.set_value(j); -} - -void func5(std::promise<void>& p) -{ - std::this_thread::sleep_for(ms(500)); - p.set_value(); -} - -int main() -{ - typedef std::chrono::high_resolution_clock Clock; - { - typedef int T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func1, std::move(p)).detach(); - assert(f.valid()); - assert(f.wait_for(ms(300)) == std::future_status::timeout); - assert(f.valid()); - assert(f.wait_for(ms(300)) == std::future_status::ready); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } - { - typedef int& T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func3, std::move(p)).detach(); - assert(f.valid()); - assert(f.wait_for(ms(300)) == std::future_status::timeout); - assert(f.valid()); - assert(f.wait_for(ms(300)) == std::future_status::ready); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } - { - typedef void T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func5, std::move(p)).detach(); - assert(f.valid()); - assert(f.wait_for(ms(300)) == std::future_status::timeout); - assert(f.valid()); - assert(f.wait_for(ms(300)) == std::future_status::ready); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } -} diff --git a/libcxx/test/thread/futures/futures.atomic_future/wait_until.pass.cpp b/libcxx/test/thread/futures/futures.atomic_future/wait_until.pass.cpp deleted file mode 100644 index f6e3000a74f..00000000000 --- a/libcxx/test/thread/futures/futures.atomic_future/wait_until.pass.cpp +++ /dev/null @@ -1,95 +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. -// -//===----------------------------------------------------------------------===// - -// <future> - -// class atomic_future<R> - -// template <class Clock, class Duration> -// future_status -// wait_until(const chrono::time_point<Clock, Duration>& abs_time) const; - -#include <future> -#include <cassert> - -typedef std::chrono::milliseconds ms; - -void func1(std::promise<int>& p) -{ - std::this_thread::sleep_for(ms(500)); - p.set_value(3); -} - -int j = 0; - -void func3(std::promise<int&>& p) -{ - std::this_thread::sleep_for(ms(500)); - j = 5; - p.set_value(j); -} - -void func5(std::promise<void>& p) -{ - std::this_thread::sleep_for(ms(500)); - p.set_value(); -} - -int main() -{ - typedef std::chrono::high_resolution_clock Clock; - { - typedef int T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func1, std::move(p)).detach(); - assert(f.valid()); - assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); - assert(f.valid()); - assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } - { - typedef int& T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func3, std::move(p)).detach(); - assert(f.valid()); - assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); - assert(f.valid()); - assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } - { - typedef void T; - std::promise<T> p; - std::atomic_future<T> f = p.get_future(); - std::thread(func5, std::move(p)).detach(); - assert(f.valid()); - assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); - assert(f.valid()); - assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready); - assert(f.valid()); - Clock::time_point t0 = Clock::now(); - f.wait(); - Clock::time_point t1 = Clock::now(); - assert(f.valid()); - assert(t1-t0 < ms(5)); - } -} diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp index 339017b0aaa..70ea0ad31fe 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_copy.fail.cpp @@ -32,8 +32,8 @@ int main() std::packaged_task<double(int, char)> p0(A(5)); std::packaged_task<double(int, char)> p; p = p0; - assert(!p0); - assert(p); + assert(!p0.valid()); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -42,7 +42,7 @@ int main() std::packaged_task<double(int, char)> p0; std::packaged_task<double(int, char)> p; p = p0; - assert(!p0); - assert(!p); + assert(!p0.valid()); + assert(!p.valid()); } } diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp index f3696e53728..a0f711aaa78 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/assign_move.pass.cpp @@ -32,8 +32,8 @@ int main() std::packaged_task<double(int, char)> p0(A(5)); std::packaged_task<double(int, char)> p; p = std::move(p0); - assert(!p0); - assert(p); + assert(!p0.valid()); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -42,7 +42,7 @@ int main() std::packaged_task<double(int, char)> p0; std::packaged_task<double(int, char)> p; p = std::move(p0); - assert(!p0); - assert(!p); + assert(!p0.valid()); + assert(!p.valid()); } } diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp index 4ea0a062a7e..9884c49a6dc 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_copy.fail.cpp @@ -31,8 +31,8 @@ int main() { std::packaged_task<double(int, char)> p0(A(5)); std::packaged_task<double(int, char)> p(p0); - assert(!p0); - assert(p); + assert(!p0.valid()); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -40,7 +40,7 @@ int main() { std::packaged_task<double(int, char)> p0; std::packaged_task<double(int, char)> p(p0); - assert(!p0); - assert(!p); + assert(!p0.valid()); + assert(!p.valid()); } } diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp index f78ec85c46a..f53b26e2949 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_default.pass.cpp @@ -21,5 +21,5 @@ struct A {}; int main() { std::packaged_task<A(int, char)> p; - assert(!p); + assert(!p.valid()); } diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp index f30cd7b9b3f..8ae59216316 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func.pass.cpp @@ -39,7 +39,7 @@ int main() { { std::packaged_task<double(int, char)> p(A(5)); - assert(p); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -51,7 +51,7 @@ int main() { A a(5); std::packaged_task<double(int, char)> p(a); - assert(p); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp index 2465d83a873..63042e8c5f8 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_func_alloc.pass.cpp @@ -43,7 +43,7 @@ int main() std::packaged_task<double(int, char)> p(std::allocator_arg, test_allocator<A>(), A(5)); assert(test_alloc_base::count > 0); - assert(p); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -58,7 +58,7 @@ int main() std::packaged_task<double(int, char)> p(std::allocator_arg, test_allocator<A>(), a); assert(test_alloc_base::count > 0); - assert(p); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp index 62b515aebbc..c668a678ef8 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/ctor_move.pass.cpp @@ -31,8 +31,8 @@ int main() { std::packaged_task<double(int, char)> p0(A(5)); std::packaged_task<double(int, char)> p = std::move(p0); - assert(!p0); - assert(p); + assert(!p0.valid()); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -40,7 +40,7 @@ int main() { std::packaged_task<double(int, char)> p0; std::packaged_task<double(int, char)> p = std::move(p0); - assert(!p0); - assert(!p); + assert(!p0.valid()); + assert(!p.valid()); } } diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp index 11378a35bfa..9f549aa3fc1 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.members/swap.pass.cpp @@ -32,8 +32,8 @@ int main() std::packaged_task<double(int, char)> p0(A(5)); std::packaged_task<double(int, char)> p; p.swap(p0); - assert(!p0); - assert(p); + assert(!p0.valid()); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -42,7 +42,7 @@ int main() std::packaged_task<double(int, char)> p0; std::packaged_task<double(int, char)> p; p.swap(p0); - assert(!p0); - assert(!p); + assert(!p0.valid()); + assert(!p.valid()); } } diff --git a/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp b/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp index ae99474099b..ef99f615354 100644 --- a/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp +++ b/libcxx/test/thread/futures/futures.tas/futures.task.nonmembers/swap.pass.cpp @@ -34,8 +34,8 @@ int main() std::packaged_task<double(int, char)> p0(A(5)); std::packaged_task<double(int, char)> p; swap(p, p0); - assert(!p0); - assert(p); + assert(!p0.valid()); + assert(p.valid()); std::future<double> f = p.get_future(); p(3, 'a'); assert(f.get() == 105.0); @@ -44,7 +44,7 @@ int main() std::packaged_task<double(int, char)> p0; std::packaged_task<double(int, char)> p; swap(p, p0); - assert(!p0); - assert(!p); + assert(!p0.valid()); + assert(!p.valid()); } } diff --git a/libcxx/test/thread/futures/futures.atomic_future/ctor_future.pass.cpp b/libcxx/test/thread/futures/futures.unique_future/share.pass.cpp index 443ff755a8c..a19ce2e3917 100644 --- a/libcxx/test/thread/futures/futures.atomic_future/ctor_future.pass.cpp +++ b/libcxx/test/thread/futures/futures.unique_future/share.pass.cpp @@ -9,9 +9,9 @@ // <future> -// class atomic_future<R> +// class future<R> -// atomic_future(future<R>&& rhs); +// shared_future<R> share() &&; #include <future> #include <cassert> @@ -22,14 +22,14 @@ int main() typedef int T; std::promise<T> p; std::future<T> f0 = p.get_future(); - std::atomic_future<T> f = std::move(f0); + std::shared_future<T> f = std::move(f0.share()); assert(!f0.valid()); assert(f.valid()); } { typedef int T; std::future<T> f0; - std::atomic_future<T> f = std::move(f0); + std::shared_future<T> f = std::move(f0.share()); assert(!f0.valid()); assert(!f.valid()); } @@ -37,14 +37,14 @@ int main() typedef int& T; std::promise<T> p; std::future<T> f0 = p.get_future(); - std::atomic_future<T> f = std::move(f0); + std::shared_future<T> f = std::move(f0.share()); assert(!f0.valid()); assert(f.valid()); } { typedef int& T; std::future<T> f0; - std::atomic_future<T> f = std::move(f0); + std::shared_future<T> f = std::move(f0.share()); assert(!f0.valid()); assert(!f.valid()); } @@ -52,14 +52,14 @@ int main() typedef void T; std::promise<T> p; std::future<T> f0 = p.get_future(); - std::atomic_future<T> f = std::move(f0); + std::shared_future<T> f = std::move(f0.share()); assert(!f0.valid()); assert(f.valid()); } { typedef void T; std::future<T> f0; - std::atomic_future<T> f = std::move(f0); + std::shared_future<T> f = std::move(f0.share()); assert(!f0.valid()); assert(!f.valid()); } |
