diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-07 22:54:53 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-07 22:54:53 +0000 |
| commit | 46ae5a0b38da476c804f1b54dff959bc54027256 (patch) | |
| tree | 0220fea9d7f69eeaccc492329a5e026594268376 /libstdc++-v3/include | |
| parent | 9264181226ba92b39678998921ccde46d11ceade (diff) | |
| download | gcc-46ae5a0b38da476c804f1b54dff959bc54027256.tar.gz | |
* include/std/future (__location_invariant): Move specializations
after preprocessor condition.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213744 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/std/future | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index c3aaaec22d9..8989474c74c 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -551,6 +551,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void _M_destroy() { delete this; } }; +#ifndef _GLIBCXX_ASYNC_ABI_COMPAT + // Allow _Setter objects to be stored locally in std::function template<typename _Res, typename _Arg> struct __is_location_invariant @@ -563,8 +565,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION <__future_base::_Task_setter<_Res_ptr, _Fn, _Res>> : true_type { }; -#ifndef _GLIBCXX_ASYNC_ABI_COMPAT - /// Common implementation for future and shared_future. template<typename _Res> class __basic_future : public __future_base |