diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-02-05 20:28:37 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-02-05 20:28:37 +0000 |
| commit | c281a7a19fbbf229334f595e879e0fed42613264 (patch) | |
| tree | d4eaeac1d793795b29d0578203c694b19b7b04b1 /libcxx/include/algorithm | |
| parent | d40bb5353dd91dd3b6c886495b20dd08bf3fe7d2 (diff) | |
| download | bcm5719-llvm-c281a7a19fbbf229334f595e879e0fed42613264.tar.gz bcm5719-llvm-c281a7a19fbbf229334f595e879e0fed42613264.zip | |
Get tests running with warnings. Fix warnings in headers and tests
llvm-svn: 228344
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index e8720ccf16d..68173f472c8 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -4368,8 +4368,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) @@ -4403,7 +4401,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) { @@ -4790,7 +4787,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) { |
