diff mbox series

Restore enable_if lost during original import of pstl

Message ID xkqe7e3wpisj.fsf@trodgers.remote.f30
State New
Headers show
Series Restore enable_if lost during original import of pstl | expand

Commit Message

Thomas Rodgers Nov. 19, 2019, 4:54 a.m. UTC 
* include/pstl/glue_numeric_defs.h: Restore enable_if lost during original
	import of pstl.
	* include/pstl/glue_numeric_impl.h: Likewise.
---
 libstdc++-v3/include/pstl/glue_numeric_defs.h | 2 +-
 libstdc++-v3/include/pstl/glue_numeric_impl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jonathan Wakely Nov. 19, 2019, 8:45 a.m. UTC | #1 
On 18/11/19 20:54 -0800, Thomas Rodgers wrote:
>
>	* include/pstl/glue_numeric_defs.h: Restore enable_if lost during original
>	import of pstl.
>	* include/pstl/glue_numeric_impl.h: Likewise.

OK for trunk and gcc-9-branch, thanks.
Thomas Rodgers Dec. 11, 2019, 5:20 a.m. UTC | #2 
Tested x86_64-pc-linux-gnu, committed to trunk, backported to
gcc-9-branch.

Jonathan Wakely writes:

> On 18/11/19 20:54 -0800, Thomas Rodgers wrote:
>>
>>	* include/pstl/glue_numeric_defs.h: Restore enable_if lost during original
>>	import of pstl.
>>	* include/pstl/glue_numeric_impl.h: Likewise.
>
> OK for trunk and gcc-9-branch, thanks.
diff mbox series

Patch

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)
 {