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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4a092e835fa6d7798d9f282afc11aa845d8e98e7..40a7116b8d9d1b4cb9aebe7df06deff6c3dd5967 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2019-12-10  Thomas Rodgers  <trodgers@redhat.com>
+
+       Backport from mainline
+       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-09  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/include/pstl/glue_numeric_defs.h b/libstdc++-v3/include/pstl/glue_numeric_defs.h
index 55187f1f6ea2c86e7675bf243b82d2555f96af87..12e967b162986a2198510c010f7b9b969615503e 100644 (file)
--- 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 bde0b03f3fb1dcdb30bcb139b4728901b620ba5b..748f47ce0c0990ace589ec615158774789da629d 100644 (file)
--- 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)
 {