diff options
| author | dim <dim@FreeBSD.org> | 2015-03-07 22:53:15 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-03-07 22:53:15 +0000 |
| commit | 4ea94bd2cbee03c98b4880728097db7e62146f5a (patch) | |
| tree | dfecd1a50fdd4b1b1d1b2500da5ca86c73dfff88 /contrib/libc++/include/algorithm | |
| parent | 9dfee49675cefb94eb29a042c1164e7549123fc5 (diff) | |
| download | FreeBSD-src-4ea94bd2cbee03c98b4880728097db7e62146f5a.zip FreeBSD-src-4ea94bd2cbee03c98b4880728097db7e62146f5a.tar.gz | |
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 after: 3 days
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) { |
