Skip to content

Commit 73409aa

Browse files
committed
Resolve conflict between 2018-06 LWG Motion 19 and 2018-06 LWG Motion 21.
Motion 19 (P0769R2) adds shift_right to <algorithm> as a non-constexpr algorithm. Motion 21 (P0879R0) asks that we mark all (non-parallel) algorithms in <algorithm> as constexpr, but its wording doesn't list shift_right as shift_right did not yet exist. After consultation with LWG, resolve this state of affairs by marking shift_right as constexpr, in line with the editing note in P0879R0.
1 parent ad1ad15 commit 73409aa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

source/algorithms.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@
576576
ForwardIterator first, ForwardIterator last,
577577
typename iterator_traits<ForwardIterator>::difference_type n);
578578
template<class ForwardIterator>
579-
ForwardIterator
579+
constexpr ForwardIterator
580580
shift_right(ForwardIterator first, ForwardIterator last,
581581
typename iterator_traits<ForwardIterator>::difference_type n);
582582
template<class ExecutionPolicy, class ForwardIterator>
@@ -3590,7 +3590,7 @@
35903590
\indexlibrary{\idxcode{shift_right}}%
35913591
\begin{itemdecl}
35923592
template<class ForwardIterator>
3593-
ForwardIterator
3593+
constexpr ForwardIterator
35943594
shift_right(ForwardIterator first, ForwardIterator last,
35953595
typename iterator_traits<ForwardIterator>::difference_type n);
35963596
template<class ExecutionPolicy, class ForwardIterator>

0 commit comments

Comments
 (0)