diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2018-02-06 18:58:05 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2018-02-06 18:58:05 +0000 |
| commit | f951fc399fa5219682b8fd7fe537b43a64f18c1a (patch) | |
| tree | 0217961279973cfdc8ee00c9d15a371f6997488a /libcxx/include/algorithm | |
| parent | 9831b843d2044818d7a01a4b0f78c12c1c28192a (diff) | |
| download | llvm-f951fc399fa5219682b8fd7fe537b43a64f18c1a.zip llvm-f951fc399fa5219682b8fd7fe537b43a64f18c1a.tar.gz llvm-f951fc399fa5219682b8fd7fe537b43a64f18c1a.tar.bz2 | |
Fix misleading indentation; replace a couple of NULLs with nullptr. Resolves https://reviews.llvm.org/D42945 ; thanks to Bruce Mitchener for the patch.
llvm-svn: 324378
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 9d2690d..a94b07b 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -4703,9 +4703,9 @@ __stable_sort_move(_RandomAccessIterator __first1, _RandomAccessIterator __last1 ::new(__first2) value_type(_VSTD::move(*__first1)); return; case 2: - __destruct_n __d(0); + __destruct_n __d(0); unique_ptr<value_type, __destruct_n&> __h2(__first2, __d); - if (__comp(*--__last1, *__first1)) + if (__comp(*--__last1, *__first1)) { ::new(__first2) value_type(_VSTD::move(*__last1)); __d.__incr((value_type*)0); |