git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

future (__future_base::_Ptr): Use alias-declaration. 

* include/std/future (__future_base::_Ptr): Use alias-declaration.
	(__is_same_pkgdtask): Rename to __constrain_pkgdtask and use decay
	instead of remove_reference so that cv-quals are removed.

From-SVN: r181145
This commit is contained in:
Jonathan Wakely 2011-11-08 01:23:53 +00:00 committed by Jonathan Wakely
parent 7e72c65d18
commit c4d9f41936
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-08 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/future (__future_base::_Ptr): Use alias-declaration.
(__is_same_pkgdtask): Rename to __constrain_pkgdtask and use decay
instead of remove_reference so that cv-quals are removed.
2011-11-08 Ed Smith-Rowland <3dw4rd@verizon.net> 2011-11-08 Ed Smith-Rowland <3dw4rd@verizon.net>
* include/precompiled/stdc++.h: Add cstdalign. * include/precompiled/stdc++.h: Add cstdalign.

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

@ -258,17 +258,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void* _M_addr() noexcept { return static_cast<void*>(&_M_storage); } void* _M_addr() noexcept { return static_cast<void*>(&_M_storage); }
}; };
// TODO: use template alias when available
/*
template<typename _Res>
using _Ptr = unique_ptr<_Res, _Result_base::_Deleter>;
*/
/// A unique_ptr based on the instantiating type. /// A unique_ptr based on the instantiating type.
template<typename _Res> template<typename _Res>
struct _Ptr using _Ptr = unique_ptr<_Res, _Result_base::_Deleter>;
{
typedef unique_ptr<_Res, _Result_base::_Deleter> type;
};
/// Result_alloc. /// Result_alloc.
template<typename _Res, typename _Alloc> template<typename _Res, typename _Alloc>
@ -291,7 +283,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
template<typename _Res, typename _Allocator> template<typename _Res, typename _Allocator>
static typename _Ptr<_Result_alloc<_Res, _Allocator>>::type static _Ptr<_Result_alloc<_Res, _Allocator>>
_S_allocate_result(const _Allocator& __a) _S_allocate_result(const _Allocator& __a)
{ {
typedef _Result_alloc<_Res, _Allocator> __result_type; typedef _Result_alloc<_Res, _Allocator> __result_type;
@ -306,7 +298,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__a2.deallocate(__p, 1); __a2.deallocate(__p, 1);
__throw_exception_again; __throw_exception_again;
} }
return typename _Ptr<__result_type>::type(__p); return _Ptr<__result_type>(__p);
} }
@ -314,7 +306,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// associated futures. /// associated futures.
class _State_base class _State_base
{ {
typedef _Ptr<_Result_base>::type _Ptr_type; typedef _Ptr<_Result_base> _Ptr_type;
_Ptr_type _M_result; _Ptr_type _M_result;
mutex _M_mutex; mutex _M_mutex;
@ -930,9 +922,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Res> template<typename _Res>
class promise class promise
{ {
typedef __future_base::_State_base _State; typedef __future_base::_State_base _State;
typedef __future_base::_Result<_Res> _Res_type; typedef __future_base::_Result<_Res> _Res_type;
typedef typename __future_base::_Ptr<_Res_type>::type _Ptr_type; typedef __future_base::_Ptr<_Res_type> _Ptr_type;
template<typename, typename> friend class _State::_Setter; template<typename, typename> friend class _State::_Setter;
shared_ptr<_State> _M_future; shared_ptr<_State> _M_future;
@ -1028,9 +1020,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Res> template<typename _Res>
class promise<_Res&> class promise<_Res&>
{ {
typedef __future_base::_State_base _State; typedef __future_base::_State_base _State;
typedef __future_base::_Result<_Res&> _Res_type; typedef __future_base::_Result<_Res&> _Res_type;
typedef typename __future_base::_Ptr<_Res_type>::type _Ptr_type; typedef __future_base::_Ptr<_Res_type> _Ptr_type;
template<typename, typename> friend class _State::_Setter; template<typename, typename> friend class _State::_Setter;
shared_ptr<_State> _M_future; shared_ptr<_State> _M_future;
@ -1109,9 +1101,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<> template<>
class promise<void> class promise<void>
{ {
typedef __future_base::_State_base _State; typedef __future_base::_State_base _State;
typedef __future_base::_Result<void> _Res_type; typedef __future_base::_Result<void> _Res_type;
typedef typename __future_base::_Ptr<_Res_type>::type _Ptr_type; typedef __future_base::_Ptr<_Res_type> _Ptr_type;
template<typename, typename> friend class _State::_Setter; template<typename, typename> friend class _State::_Setter;
shared_ptr<_State> _M_future; shared_ptr<_State> _M_future;
@ -1272,7 +1264,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_set_result(std::move(__setter)); _M_set_result(std::move(__setter));
} }
typedef typename __future_base::_Ptr<_Result<_Res>>::type _Ptr_type; typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
_Ptr_type _M_result; _Ptr_type _M_result;
std::function<_Res(_Args...)> _M_task; std::function<_Res(_Args...)> _M_task;
@ -1289,12 +1281,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
template<typename _Task, typename _Fn, bool template<typename _Task, typename _Fn, bool
= is_same<_Task, typename remove_reference<_Fn>::type>::value> = is_same<_Task, typename decay<_Fn>::type>::value>
struct __is_same_pkgdtask struct __constrain_pkgdtask
{ typedef void __type; }; { typedef void __type; };
template<typename _Task, typename _Fn> template<typename _Task, typename _Fn>
struct __is_same_pkgdtask<_Task, _Fn, true> struct __constrain_pkgdtask<_Task, _Fn, true>
{ }; { };
/// packaged_task /// packaged_task
@ -1314,14 +1306,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ } { }
template<typename _Fn, typename = typename template<typename _Fn, typename = typename
__is_same_pkgdtask<packaged_task, _Fn>::__type> __constrain_pkgdtask<packaged_task, _Fn>::__type>
explicit explicit
packaged_task(_Fn&& __fn) packaged_task(_Fn&& __fn)
: _M_state(std::make_shared<_State_type>(std::forward<_Fn>(__fn))) : _M_state(std::make_shared<_State_type>(std::forward<_Fn>(__fn)))
{ } { }
template<typename _Fn, typename _Allocator, typename = typename template<typename _Fn, typename _Allocator, typename = typename
__is_same_pkgdtask<packaged_task, _Fn>::__type> __constrain_pkgdtask<packaged_task, _Fn>::__type>
explicit explicit
packaged_task(allocator_arg_t, const _Allocator& __a, _Fn&& __fn) packaged_task(allocator_arg_t, const _Allocator& __a, _Fn&& __fn)
: _M_state(std::allocate_shared<_State_type>(__a, : _M_state(std::allocate_shared<_State_type>(__a,
@ -1410,7 +1402,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ } { }
private: private:
typedef typename __future_base::_Ptr<_Result<_Res>>::type _Ptr_type; typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
_Ptr_type _M_result; _Ptr_type _M_result;
_BoundFn _M_fn; _BoundFn _M_fn;
@ -1440,7 +1432,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_set_result(_S_task_setter(_M_result, _M_fn)); _M_set_result(_S_task_setter(_M_result, _M_fn));
} }
typedef typename __future_base::_Ptr<_Result<_Res>>::type _Ptr_type; typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
_Ptr_type _M_result; _Ptr_type _M_result;
_BoundFn _M_fn; _BoundFn _M_fn;
thread _M_thread; thread _M_thread;