diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-08-07 23:54:53 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-08-07 23:54:53 +0100 |
| commit | db0b7db3382d475b6b8782f06d87e34e6d06a52c (patch) | |
| tree | 0220fea9d7f69eeaccc492329a5e026594268376 /libstdc++-v3/include/std/future | |
| parent | ab498225eef7228881c5096cb57200f3e92e58dd (diff) | |
| download | gcc-db0b7db3382d475b6b8782f06d87e34e6d06a52c.zip gcc-db0b7db3382d475b6b8782f06d87e34e6d06a52c.tar.gz gcc-db0b7db3382d475b6b8782f06d87e34e6d06a52c.tar.bz2 | |
future (__location_invariant): Move specializations after preprocessor condition.
* include/std/future (__location_invariant): Move specializations
after preprocessor condition.
From-SVN: r213744
Diffstat (limited to 'libstdc++-v3/include/std/future')
| -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 c3aaaec..8989474 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 |