mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-17 18:00:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore enable_if lost during original import of pstl

Browse Source 
* include/pstl/glue_numeric_defs.h: Restore enable_if lost
        during original import of pstl.
        * include/pstl/glue_numeric_impl.h: Likewise.

From-SVN: r279212
This commit is contained in:
Thomas Rodgers 2019-12-11 03:38:24 +00:00 committed by Thomas Rodgers
parent 03e5f213ee
commit 2aae713bb4
3 changed files with 8 additions and 2 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 @@
2019-12-10 Thomas Rodgers <trodgers@redhat.com>
* include/pstl/glue_numeric_defs.h: Restore enable_if lost during original
import of pstl.
* include/pstl/glue_numeric_impl.h: Likewise.
2019-12-10 Jonathan Wakely <jwakely@redhat.com>
(span(ContiguousIterator, Sentinel)): Add conditional noexcept.

2
libstdc++-v3/include/pstl/glue_numeric_defs.h
View File

@ -55,7 +55,7 @@ exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIte
_ForwardIterator2 __result, _Tp __init);
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Tp, class _BinaryOperation>
_ForwardIterator2
__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2>
exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last,
_ForwardIterator2 __result, _Tp __init, _BinaryOperation __binary_op);

2
libstdc++-v3/include/pstl/glue_numeric_impl.h
View File

@ -100,7 +100,7 @@ exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIte
}
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Tp, class _BinaryOperation>
_ForwardIterator2
__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2>
exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last,
_ForwardIterator2 __result, _Tp __init, _BinaryOperation __binary_op)
{