diff options
| author | dim <dim@FreeBSD.org> | 2015-03-11 07:22:13 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-03-11 07:22:13 +0000 |
| commit | ca486604a94efeb04bab5f8547c749064f957a74 (patch) | |
| tree | aaebaabe82f5deba1b02a0cbaa769015af95b3d3 /contrib/libc++/include/algorithm | |
| parent | 051c6169800f5164326f654da30438a6ec247108 (diff) | |
| download | FreeBSD-src-ca486604a94efeb04bab5f8547c749064f957a74.zip FreeBSD-src-ca486604a94efeb04bab5f8547c749064f957a74.tar.gz | |
MFC r279757:
Pull in r228344 from upstream libc++ trunk (by Eric Fiselier):
Get tests running with warnings. Fix warnings in headers and tests
This fixes a number of -Wunused-local-typedef warnings in libc++ headers.
MFC r279758:
Fix another -Wunused-local-typedef warning in libc++, in include/__tree.
Diffstat (limited to 'contrib/libc++/include/algorithm')
| -rw-r--r-- | contrib/libc++/include/algorithm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/contrib/libc++/include/algorithm b/contrib/libc++/include/algorithm index 02cbc81..61b0143 100644 --- a/contrib/libc++/include/algorithm +++ b/contrib/libc++/include/algorithm @@ -4365,8 +4365,6 @@ __buffered_inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator typename iterator_traits<_BidirectionalIterator>::value_type* __buff) { typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type; - typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type; - typedef typename iterator_traits<_BidirectionalIterator>::pointer pointer; __destruct_n __d(0); unique_ptr<value_type, __destruct_n&> __h2(__buff, __d); if (__len1 <= __len2) @@ -4400,7 +4398,6 @@ __inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, typename iterator_traits<_BidirectionalIterator>::difference_type __len2, typename iterator_traits<_BidirectionalIterator>::value_type* __buff, ptrdiff_t __buff_size) { - typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type; typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type; while (true) { @@ -4799,7 +4796,6 @@ void __sift_up(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp, typename iterator_traits<_RandomAccessIterator>::difference_type __len) { - typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type; typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type; if (__len > 1) { |
