svn commit: r279757 - head/contrib/libc++/include

[Dimitry Andric]

Author: dim
Date: Sat Mar  7 22:53:15 2015
New Revision: 279757
URL: https://svnweb.freebsd.org/changeset/base/279757

Log:
  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

Modified:
  head/contrib/libc++/include/__bit_reference
  head/contrib/libc++/include/algorithm

Modified: head/contrib/libc++/include/__bit_reference
==============================================================================
--- head/contrib/libc++/include/__bit_reference	Sat Mar  7 22:46:35 2015	(r279756)
+++ head/contrib/libc++/include/__bit_reference	Sat Mar  7 22:53:15 2015	(r279757)
@@ -906,7 +906,6 @@ rotate(__bit_iterator<_Cp, false> __firs
 {
     typedef __bit_iterator<_Cp, false> _I1;
     typedef  typename _I1::difference_type difference_type;
-    typedef typename _I1::__storage_type __storage_type;
     difference_type __d1 = __middle - __first;
     difference_type __d2 = __last - __middle;
     _I1 __r = __first + __d2;

Modified: head/contrib/libc++/include/algorithm
==============================================================================
--- head/contrib/libc++/include/algorithm	Sat Mar  7 22:46:35 2015	(r279756)
+++ head/contrib/libc++/include/algorithm	Sat Mar  7 22:53:15 2015	(r279757)
@@ -4365,8 +4365,6 @@ __buffered_inplace_merge(_BidirectionalI
                 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 _
                                  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)
     {