diff options
| author | Alexander Richardson <arichardson.kde@gmail.com> | 2017-11-14 11:14:25 +0000 |
|---|---|---|
| committer | Alexander Richardson <arichardson.kde@gmail.com> | 2017-11-14 11:14:25 +0000 |
| commit | 42bfedd935065060268f63063a1799cd7086fe4e (patch) | |
| tree | 43143a7a556ab7b349b3168b09b71df11947ca57 /libcxx/include/experimental/algorithm | |
| parent | dc86e1444d4291ba414b5a2bf5dee25c3aa1efd8 (diff) | |
| download | bcm5719-llvm-42bfedd935065060268f63063a1799cd7086fe4e.tar.gz bcm5719-llvm-42bfedd935065060268f63063a1799cd7086fe4e.zip | |
Rename identifiers named `__output`
Summary:
In the CHERI clang compiler __output and __input are keywords and therefore
we can't compile libc++ with our compiler.
Reviewers: mclow.lists, EricWF, theraven
Reviewed By: EricWF
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D39537
llvm-svn: 318144
Diffstat (limited to 'libcxx/include/experimental/algorithm')
| -rw-r--r-- | libcxx/include/experimental/algorithm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/experimental/algorithm b/libcxx/include/experimental/algorithm index 3801cae4f16..a6a28f07181 100644 --- a/libcxx/include/experimental/algorithm +++ b/libcxx/include/experimental/algorithm @@ -61,9 +61,9 @@ template <class _PopulationIterator, class _SampleIterator, class _Distance, class _UniformRandomNumberGenerator> inline _LIBCPP_INLINE_VISIBILITY _SampleIterator sample(_PopulationIterator __first, _PopulationIterator __last, - _SampleIterator __output, _Distance __n, + _SampleIterator __output_iter, _Distance __n, _UniformRandomNumberGenerator &&__g) { - return _VSTD::__sample(__first, __last, __output, __n, __g); + return _VSTD::__sample(__first, __last, __output_iter, __n, __g); } _LIBCPP_END_NAMESPACE_LFTS |
