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

future (__location_invariant): Move specializations after preprocessor condition. 

* include/std/future (__location_invariant): Move specializations
	after preprocessor condition.

From-SVN: r213744
This commit is contained in:
Jonathan Wakely 2014-08-07 23:54:53 +01:00 committed by Jonathan Wakely
parent ab498225ee
commit db0b7db338
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -26,6 +26,9 @@
and initialize _Task_setter with pointers. and initialize _Task_setter with pointers.
(__location_invariant): Specialize for _Setter and _Task_setter. (__location_invariant): Specialize for _Setter and _Task_setter.
* include/std/future (__location_invariant): Move specializations
after preprocessor condition.
2014-08-02 Paolo Carlini <paolo.carlini@oracle.com> 2014-08-02 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/15339 PR c++/15339

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

@ -551,6 +551,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void _M_destroy() { delete this; } void _M_destroy() { delete this; }
}; };
#ifndef _GLIBCXX_ASYNC_ABI_COMPAT
// Allow _Setter objects to be stored locally in std::function // Allow _Setter objects to be stored locally in std::function
template<typename _Res, typename _Arg> template<typename _Res, typename _Arg>
struct __is_location_invariant struct __is_location_invariant
@ -563,8 +565,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
<__future_base::_Task_setter<_Res_ptr, _Fn, _Res>> <__future_base::_Task_setter<_Res_ptr, _Fn, _Res>>
: true_type { }; : true_type { };
#ifndef _GLIBCXX_ASYNC_ABI_COMPAT
/// Common implementation for future and shared_future. /// Common implementation for future and shared_future.
template<typename _Res> template<typename _Res>
class __basic_future : public __future_base class __basic_future : public __future_base