diff options
| author | Thomas Rodgers <trodgers@redhat.com> | 2019-12-11 03:38:24 +0000 |
|---|---|---|
| committer | Thomas Rodgers <rodgertq@gcc.gnu.org> | 2019-12-11 03:38:24 +0000 |
| commit | 2aae713bb4275512b40837d0ce81d894a5bd9368 (patch) | |
| tree | 45afd1acda2b408b0d4311011591ec4e9f86f503 /libstdc++-v3 | |
| parent | 03e5f213ee8e49dd568929e69f7909562cb27280 (diff) | |
Restore enable_if lost during original import of pstl
* 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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/pstl/glue_numeric_defs.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/pstl/glue_numeric_impl.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3cc22a18b1c..a9e76cdaada 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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. diff --git a/libstdc++-v3/include/pstl/glue_numeric_defs.h b/libstdc++-v3/include/pstl/glue_numeric_defs.h index cc5a94e801a..78df1703079 100644 --- a/libstdc++-v3/include/pstl/glue_numeric_defs.h +++ b/libstdc++-v3/include/pstl/glue_numeric_defs.h @@ -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); diff --git a/libstdc++-v3/include/pstl/glue_numeric_impl.h b/libstdc++-v3/include/pstl/glue_numeric_impl.h index b1786fd387e..d5acbac5561 100644 --- a/libstdc++-v3/include/pstl/glue_numeric_impl.h +++ b/libstdc++-v3/include/pstl/glue_numeric_impl.h @@ -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) { |