OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

future (future::share): Add. 

2011-03-25  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* include/std/future (future::share): Add.
	(packaged_task::result_type): Remove as per LWG 2030.
	(packaged_task::packaged_task): Remove redundant constructors, as per
	LWG 1514.
	* testsuite/30_threads/future/members/share.cc: New.
	* testsuite/30_threads/packaged_task/requirements/typedefs.cc: Remove.

From-SVN: r171531
This commit is contained in:
Jonathan Wakely 2011-03-25 23:16:09 +00:00
parent 4be2a08168
commit e3e08a1db5
3 changed files with 96 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libstdc++-v3/include/std/future
View File

@ -618,6 +618,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename _Base_type::_Reset __reset(*this);
return std::move(this->_M_get_result()._M_value());
}
shared_future<_Res> share();
};
/// Partial specialization for future<R&>
@ -659,6 +661,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename _Base_type::_Reset __reset(*this);
return this->_M_get_result()._M_get();
}
shared_future<_Res&> share();
};
/// Explicit specialization for future<void>
@ -700,6 +704,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename _Base_type::_Reset __reset(*this);
this->_M_get_result();
}
shared_future<void> share();
};
@ -844,6 +850,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: _M_state(std::move(__uf._M_state))
{ }
template<typename _Res>
inline shared_future<_Res>
future<_Res>::share()
{ return shared_future<_Res>(std::move(*this)); }
template<typename _Res>
inline shared_future<_Res&>
future<_Res&>::share()
{ return shared_future<_Res&>(std::move(*this)); }
inline shared_future<void>
future<void>::share()
{ return shared_future<void>(std::move(*this)); }
/// Primary template for promise
template<typename _Res>
@ -1198,32 +1217,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
shared_ptr<_State_type> _M_state;
public:
typedef _Res result_type;
// Construction and destruction
packaged_task() { }
template<typename _Fn>
explicit
packaged_task(const _Fn& __fn)
: _M_state(std::make_shared<_State_type>(__fn))
{ }
template<typename _Fn>
explicit
packaged_task(_Fn&& __fn)
: _M_state(std::make_shared<_State_type>(std::move(__fn)))
: _M_state(std::make_shared<_State_type>(std::forward<_Fn>(__fn)))
{ }
explicit
packaged_task(_Res(*__fn)(_ArgTypes...))
: _M_state(std::make_shared<_State_type>(__fn))
{ }
template<typename _Fn, typename _Allocator>
explicit
packaged_task(allocator_arg_t __tag, const _Allocator& __a, _Fn __fn)
: _M_state(std::allocate_shared<_State_type>(__a, std::move(__fn)))
packaged_task(allocator_arg_t, const _Allocator& __a, _Fn&& __fn)
: _M_state(std::allocate_shared<_State_type>(__a,
std::forward<_Fn>(__fn)))
{ }
~packaged_task()

73
libstdc++-v3/testsuite/30_threads/future/members/share.cc Normal file
View File

@ -0,0 +1,73 @@
// { 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/>.
#include <future>
#include <testsuite_hooks.h>
int value = 99;
void test01()
{
bool test __attribute__((unused)) = true;
std::promise<int> p1;
std::future<int> f1(p1.get_future());
std::shared_future<int> f2 = f1.share();
p1.set_value(value);
VERIFY( f2.get() == value );
}
void test02()
{
bool test __attribute__((unused)) = true;
std::promise<int&> p1;
std::future<int&> f1(p1.get_future());
std::shared_future<int&> f2 = f1.share();
p1.set_value(value);
VERIFY( &f2.get() == &value );
}
void test03()
{
std::promise<void> p1;
std::future<void> f1(p1.get_future());
std::shared_future<void> f2 = f1.share();
p1.set_value();
f2.get();
}
int main()
{
test01();
test02();
test03();
return 0;
}

31
libstdc++-v3/testsuite/30_threads/packaged_task/requirements/typedefs.cc
View File

@ -1,31 +0,0 @@
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// { dg-require-cstdint "" }
// { dg-require-gthreads "" }
// { dg-require-atomic-builtins "" }
// Copyright (C) 2009 Free Software Foundation
//
// 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/>.
#include <future>
void test01()
{
// Check for required typedefs
typedef std::packaged_task<int()> test_type;
typedef test_type::result_type result_type;
}