svn commit: r279874 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include

[Dimitry Andric]

Author: dim
Date: Wed Mar 11 07:22:13 2015
New Revision: 279874
URL: https://svnweb.freebsd.org/changeset/base/279874

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

Modified:
  stable/9/contrib/libc++/include/__bit_reference
  stable/9/contrib/libc++/include/__tree
  stable/9/contrib/libc++/include/algorithm
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/   (props changed)
  stable/9/contrib/libc++/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/contrib/libc++/include/__bit_reference
  stable/10/contrib/libc++/include/__tree
  stable/10/contrib/libc++/include/algorithm
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/contrib/libc++/include/__bit_reference
==============================================================================
--- stable/9/contrib/libc++/include/__bit_reference	Wed Mar 11 06:06:24 2015	(r279873)
+++ stable/9/contrib/libc++/include/__bit_reference	Wed Mar 11 07:22:13 2015	(r279874)
@@ -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: stable/9/contrib/libc++/include/__tree
==============================================================================
--- stable/9/contrib/libc++/include/__tree	Wed Mar 11 06:06:24 2015	(r279873)
+++ stable/9/contrib/libc++/include/__tree	Wed Mar 11 07:22:13 2015	(r279874)
@@ -2069,7 +2069,6 @@ template <class _Key>
 typename __tree<_Tp, _Compare, _Allocator>::size_type
 __tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const
 {
-    typedef pair<const_iterator, const_iterator> _Pp;
     __node_const_pointer __result = __end_node();
     __node_const_pointer __rt = __root();
     while (__rt != nullptr)

Modified: stable/9/contrib/libc++/include/algorithm
==============================================================================
--- stable/9/contrib/libc++/include/algorithm	Wed Mar 11 06:06:24 2015	(r279873)
+++ stable/9/contrib/libc++/include/algorithm	Wed Mar 11 07:22:13 2015	(r279874)
@@ -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)
     {