diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-07 11:27:06 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-07 11:27:06 +0000 |
| commit | 5741d86d112047f839fade3547ada3afaf495b17 (patch) | |
| tree | 513f889e7c1024b4bd41283d96e6725846c8d6a5 /libcxx/include/experimental/algorithm | |
| parent | f62eb6b29a9fecc1822853fdb393dbad60010560 (diff) | |
| download | bcm5719-llvm-5741d86d112047f839fade3547ada3afaf495b17.tar.gz bcm5719-llvm-5741d86d112047f839fade3547ada3afaf495b17.zip | |
Replace identifiers called `__out` because Windows.h #defines it.
Windows is greedy and it defines the identifier `__out` as a macro.
This patch renames all conflicting libc++ identifiers in order
to correctly work on Windows.
llvm-svn: 291345
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 392ca1fa41c..b32d7ca66bd 100644 --- a/libcxx/include/experimental/algorithm +++ b/libcxx/include/experimental/algorithm @@ -60,9 +60,9 @@ template <class _PopulationIterator, class _SampleIterator, class _Distance, class _UniformRandomNumberGenerator> inline _LIBCPP_INLINE_VISIBILITY _SampleIterator sample(_PopulationIterator __first, _PopulationIterator __last, - _SampleIterator __out, _Distance __n, + _SampleIterator __output, _Distance __n, _UniformRandomNumberGenerator &&__g) { - return _VSTD::__sample(__first, __last, __out, __n, __g); + return _VSTD::__sample(__first, __last, __output, __n, __g); } _LIBCPP_END_NAMESPACE_LFTS |
