forked from gcc-mirror/gcc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* include/std/future (promise): Add constructors for uses-allocator
construction from rvalue promise. (packaged_task): Implement LWG 2067. Add additional constructors for uses-allocator construction. * testsuite/30_threads/packaged_task/cons/3.cc: New. * testsuite/30_threads/packaged_task/cons/alloc2.cc: New. * testsuite/30_threads/promise/cons/alloc2.cc: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180757 138bc75d-0d04-0410-961f-82ee72b054a4
- Loading branch information
redi
committed
Nov 2, 2011
1 parent
8d9b019
commit b9778b3
Showing
5 changed files
with
197 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } } | ||
| // { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } } | ||
| // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } } | ||
| // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } | ||
| // { dg-require-cstdint "" } | ||
| // { dg-require-gthreads "" } | ||
| // { dg-require-atomic-builtins "" } | ||
|
|
||
| // Copyright (C) 2011 Free Software Foundation, Inc. | ||
| // | ||
| // This file is part of the GNU ISO C++ Library. This library is free | ||
| // software; you can redistribute it and/or modify it under the | ||
| // terms of the GNU General Public License as published by the | ||
| // Free Software Foundation; either version 3, or (at your option) | ||
| // any later version. | ||
|
|
||
| // This library is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
|
|
||
| // You should have received a copy of the GNU General Public License along | ||
| // with this library; see the file COPYING3. If not see | ||
| // <http://www.gnu.org/licenses/>. | ||
|
|
||
| // LWG 2067. packaged_task should have deleted copy c'tor with const parameter | ||
|
|
||
| #include <future> | ||
| #include <thread> | ||
| #include <testsuite_hooks.h> | ||
|
|
||
| template<typename F> | ||
| std::future<typename std::result_of<F()>::type> spawn_task(F f) | ||
| { | ||
| typedef typename std::result_of<F()>::type result_type; | ||
| std::packaged_task<result_type()> task(std::move(f)); | ||
| std::future<result_type> res(task.get_future()); | ||
| std::thread(std::move(task)).detach(); | ||
| return res; | ||
| } | ||
|
|
||
| int get_res() | ||
| { | ||
| return 42; | ||
| } | ||
|
|
||
| void test01() | ||
| { | ||
| auto f = spawn_task(get_res); | ||
| VERIFY( f.get() == get_res() ); | ||
| } | ||
|
|
||
| int main() | ||
| { | ||
| test01(); | ||
| } |
40 changes: 40 additions & 0 deletions
40
libstdc++-v3/testsuite/30_threads/packaged_task/cons/alloc2.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // { dg-do compile } | ||
| // { dg-options "-std=gnu++0x" } | ||
| // { dg-require-cstdint "" } | ||
| // { dg-require-gthreads "" } | ||
| // { dg-require-atomic-builtins "" } | ||
|
|
||
| // Copyright (C) 2011 Free Software Foundation, Inc. | ||
| // | ||
| // This file is part of the GNU ISO C++ Library. This library is free | ||
| // software; you can redistribute it and/or modify it under the | ||
| // terms of the GNU General Public License as published by the | ||
| // Free Software Foundation; either version 3, or (at your option) | ||
| // any later version. | ||
|
|
||
| // This library is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
|
|
||
| // You should have received a copy of the GNU General Public License along | ||
| // with this library; see the file COPYING3. If not see | ||
| // <http://www.gnu.org/licenses/>. | ||
|
|
||
| // Test that packaged_task can be default-constructed or move-constructed | ||
| // in a context that does uses-allocator construction. | ||
|
|
||
| #include <future> | ||
| #include <memory> | ||
| #include <tuple> | ||
|
|
||
| using std::packaged_task; | ||
| using std::allocator_arg; | ||
| using std::allocator; | ||
| using std::tuple; | ||
|
|
||
| typedef packaged_task<void()> task; | ||
| allocator<task> a; | ||
|
|
||
| tuple<task> t1{ allocator_arg, a }; | ||
| tuple<task> t2{ allocator_arg, a, task{} }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // { dg-do compile } | ||
| // { dg-options "-std=gnu++0x" } | ||
| // { dg-require-cstdint "" } | ||
| // { dg-require-gthreads "" } | ||
| // { dg-require-atomic-builtins "" } | ||
|
|
||
| // Copyright (C) 2011 Free Software Foundation, Inc. | ||
| // | ||
| // This file is part of the GNU ISO C++ Library. This library is free | ||
| // software; you can redistribute it and/or modify it under the | ||
| // terms of the GNU General Public License as published by the | ||
| // Free Software Foundation; either version 3, or (at your option) | ||
| // any later version. | ||
|
|
||
| // This library is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
|
|
||
| // You should have received a copy of the GNU General Public License along | ||
| // with this library; see the file COPYING3. If not see | ||
| // <http://www.gnu.org/licenses/>. | ||
|
|
||
| // Test that promise can be default-constructed or move-constructed | ||
| // in a context that does uses-allocator construction. | ||
|
|
||
| #include <future> | ||
| #include <memory> | ||
| #include <tuple> | ||
|
|
||
| using std::promise; | ||
| using std::allocator_arg; | ||
| using std::allocator; | ||
| using std::tuple; | ||
|
|
||
| typedef promise<int> p; | ||
| typedef promise<int&> pr; | ||
| typedef promise<void> pv; | ||
| allocator<p> a; | ||
|
|
||
| tuple<p, pr, pv> t1{ allocator_arg, a }; | ||
| tuple<p, pr, pv> t2{ allocator_arg, a, p{}, pr{}, pv{} }; |