diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-08-28 21:55:00 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-08-28 21:55:00 +0000 |
| commit | 040411762fde039dcd1a7f513d95d01266bfa94d (patch) | |
| tree | 338fa1d4c00cf3359ee9a454ba34b53d073ca798 /libcxx/include/experimental/algorithm | |
| parent | 61c0b0c32a0a14003f65c84d3bceec7eb3c10c3d (diff) | |
| download | bcm5719-llvm-040411762fde039dcd1a7f513d95d01266bfa94d.tar.gz bcm5719-llvm-040411762fde039dcd1a7f513d95d01266bfa94d.zip | |
Mark LWG 2716 as complete - shuffle and sample disallows lvalue URNGs.
Libc++'s implementation of shuffle and sample already support lvalue and rvalue
RNG's. This patch adds tests for both categories and marks the issue as complete.
This patch also contains drive-by change for std::experimental::sample which
improves the diagnostics produced when the correct iterator categories are
not supplied.
llvm-svn: 279947
Diffstat (limited to 'libcxx/include/experimental/algorithm')
| -rw-r--r-- | libcxx/include/experimental/algorithm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libcxx/include/experimental/algorithm b/libcxx/include/experimental/algorithm index 3902111c54e..10eafbdbabe 100644 --- a/libcxx/include/experimental/algorithm +++ b/libcxx/include/experimental/algorithm @@ -107,6 +107,9 @@ _SampleIterator sample(_PopulationIterator __first, _PopCategory; typedef typename iterator_traits<_PopulationIterator>::difference_type _Difference; + static_assert(__is_forward_iterator<_PopulationIterator>::value || + __is_random_access_iterator<_SampleIterator>::value, + "SampleIterator must meet the requirements of RandomAccessIterator"); typedef typename common_type<_Distance, _Difference>::type _CommonType; _LIBCPP_ASSERT(__n >= 0, "N must be a positive number."); return _VSTD_LFTS::__sample( |
