* [PATCH] Restore enable_if lost during original import of pstl
@ 2019-11-19 4:55 Thomas Rodgers
2019-11-19 8:45 ` Jonathan Wakely
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Rodgers @ 2019-11-19 4:55 UTC (permalink / raw)
To: gcc-patches, libstdc++
* 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(-)
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)
{
--
2.21.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Restore enable_if lost during original import of pstl
2019-11-19 4:55 [PATCH] Restore enable_if lost during original import of pstl Thomas Rodgers
@ 2019-11-19 8:45 ` Jonathan Wakely
2019-12-11 5:20 ` Thomas Rodgers
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Wakely @ 2019-11-19 8:45 UTC (permalink / raw)
To: Thomas Rodgers; +Cc: gcc-patches, libstdc++
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Restore enable_if lost during original import of pstl
2019-11-19 8:45 ` Jonathan Wakely
@ 2019-12-11 5:20 ` Thomas Rodgers
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Rodgers @ 2019-12-11 5:20 UTC (permalink / raw)
To: gcc-patches, libstdc++
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-11 5:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-19 4:55 [PATCH] Restore enable_if lost during original import of pstl Thomas Rodgers
2019-11-19 8:45 ` Jonathan Wakely
2019-12-11 5:20 ` Thomas Rodgers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).