From 2f2585ed25883d415bf451743a8d22aa17d64e9c Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 11 Dec 2019 03:38:53 +0000 Subject: [PATCH] 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: r279213 --- libstdc++-v3/ChangeLog | 10 ++++++++++ libstdc++-v3/include/pstl/glue_numeric_defs.h | 2 +- libstdc++-v3/include/pstl/glue_numeric_impl.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4a092e835fa6..40a7116b8d9d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2019-12-10 Thomas Rodgers + + Backport from mainline + 2019-12-10 Thomas Rodgers + + * include/pstl/glue_numeric_defs.h: Restore enable_if lost during original + import of pstl. + * include/pstl/glue_numeric_impl.h: Likewise. + + 2019-12-09 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/include/pstl/glue_numeric_defs.h b/libstdc++-v3/include/pstl/glue_numeric_defs.h index 55187f1f6ea2..12e967b16298 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 -_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 bde0b03f3fb1..748f47ce0c09 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 -_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.47.2