From owner-svn-src-all@FreeBSD.ORG Wed Mar 11 07:22:16 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F16DDBB1; Wed, 11 Mar 2015 07:22:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBD2CCFB; Wed, 11 Mar 2015 07:22:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2B7MFgR033597; Wed, 11 Mar 2015 07:22:15 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2B7MFP7033594; Wed, 11 Mar 2015 07:22:15 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201503110722.t2B7MFP7033594@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 11 Mar 2015 07:22:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r279874 - in stable: 10/contrib/libc++/include 9/contrib/libc++/include X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2015 07:22:16 -0000 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/10/contrib/libc++/include/__bit_reference stable/10/contrib/libc++/include/__tree stable/10/contrib/libc++/include/algorithm Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: 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) Modified: stable/10/contrib/libc++/include/__bit_reference ============================================================================== --- stable/10/contrib/libc++/include/__bit_reference Wed Mar 11 06:06:24 2015 (r279873) +++ stable/10/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/10/contrib/libc++/include/__tree ============================================================================== --- stable/10/contrib/libc++/include/__tree Wed Mar 11 06:06:24 2015 (r279873) +++ stable/10/contrib/libc++/include/__tree Wed Mar 11 07:22:13 2015 (r279874) @@ -2069,7 +2069,6 @@ template typename __tree<_Tp, _Compare, _Allocator>::size_type __tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const { - typedef pair _Pp; __node_const_pointer __result = __end_node(); __node_const_pointer __rt = __root(); while (__rt != nullptr) Modified: stable/10/contrib/libc++/include/algorithm ============================================================================== --- stable/10/contrib/libc++/include/algorithm Wed Mar 11 06:06:24 2015 (r279873) +++ stable/10/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 __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) {