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

future (__future_base::_Setter::operator(), [...]): Make call operators const. 

* include/std/future (__future_base::_Setter::operator(),
	__future_base::_Task_setter::operator()): Make call operators const.

From-SVN: r218553
This commit is contained in:
Jonathan Wakely 2014-12-10 00:39:37 +00:00 committed by Jonathan Wakely
parent d6f64424aa
commit 9131b50960
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -8,6 +8,9 @@
* include/bits/locale_facets_nonio.h (__timepunct::_M_cache): Remove * include/bits/locale_facets_nonio.h (__timepunct::_M_cache): Remove
unused declaration. unused declaration.
* include/std/future (__future_base::_Setter::operator(),
__future_base::_Task_setter::operator()): Make call operators const.
2014-12-09 Jonathan Wakely <jwakely@redhat.com> 2014-12-09 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/64203 PR libstdc++/64203

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

@ -455,7 +455,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
"Invalid specialisation"); "Invalid specialisation");
// Used by std::promise to copy construct the result. // Used by std::promise to copy construct the result.
typename promise<_Res>::_Ptr_type operator()() typename promise<_Res>::_Ptr_type operator()() const
{ {
_State_baseV2::_S_check(_M_promise->_M_future); _State_baseV2::_S_check(_M_promise->_M_future);
_M_promise->_M_storage->_M_set(*_M_arg); _M_promise->_M_storage->_M_set(*_M_arg);
@ -470,7 +470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct _Setter<_Res, _Res&&> struct _Setter<_Res, _Res&&>
{ {
// Used by std::promise to move construct the result. // Used by std::promise to move construct the result.
typename promise<_Res>::_Ptr_type operator()() typename promise<_Res>::_Ptr_type operator()() const
{ {
_State_baseV2::_S_check(_M_promise->_M_future); _State_baseV2::_S_check(_M_promise->_M_future);
_M_promise->_M_storage->_M_set(std::move(*_M_arg)); _M_promise->_M_storage->_M_set(std::move(*_M_arg));
@ -487,7 +487,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct _Setter<_Res, __exception_ptr_tag> struct _Setter<_Res, __exception_ptr_tag>
{ {
// Used by std::promise to store an exception as the result. // Used by std::promise to store an exception as the result.
typename promise<_Res>::_Ptr_type operator()() typename promise<_Res>::_Ptr_type operator()() const
{ {
_State_baseV2::_S_check(_M_promise->_M_future); _State_baseV2::_S_check(_M_promise->_M_future);
_M_promise->_M_storage->_M_error = *_M_ex; _M_promise->_M_storage->_M_error = *_M_ex;
@ -1286,7 +1286,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<> template<>
struct __future_base::_State_base::_Setter<void, void> struct __future_base::_State_base::_Setter<void, void>
{ {
promise<void>::_Ptr_type operator()() promise<void>::_Ptr_type operator()() const
{ {
_State_base::_S_check(_M_promise->_M_future); _State_base::_S_check(_M_promise->_M_future);
return std::move(_M_promise->_M_storage); return std::move(_M_promise->_M_storage);
@ -1310,7 +1310,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __future_base::_Task_setter struct __future_base::_Task_setter
{ {
// Invoke the function and provide the result to the caller. // Invoke the function and provide the result to the caller.
_Ptr_type operator()() _Ptr_type operator()() const
{ {
__try __try
{ {
@ -1333,7 +1333,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Ptr_type, typename _Fn> template<typename _Ptr_type, typename _Fn>
struct __future_base::_Task_setter<_Ptr_type, _Fn, void> struct __future_base::_Task_setter<_Ptr_type, _Fn, void>
{ {
_Ptr_type operator()() _Ptr_type operator()() const
{ {
__try __try
{ {