From owner-svn-src-all@FreeBSD.ORG Fri Dec 30 22:59:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3ED4106564A; Fri, 30 Dec 2011 22:59:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9800D8FC16; Fri, 30 Dec 2011 22:59:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBUMx0sw034999; Fri, 30 Dec 2011 22:59:00 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBUMx01Q034996; Fri, 30 Dec 2011 22:59:00 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201112302259.pBUMx01Q034996@svn.freebsd.org> From: Dimitry Andric Date: Fri, 30 Dec 2011 22:59:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229046 - stable/9/contrib/libstdc++/include/debug X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 30 Dec 2011 22:59:00 -0000 Author: dim Date: Fri Dec 30 22:59:00 2011 New Revision: 229046 URL: http://svn.freebsd.org/changeset/base/229046 Log: MFC r228328: Make it possible to use the debug versions of std::map and std::multimap with clang, by removing two unneeded using declarations. Otherwise, you would get errors similar to: /usr/include/c++/4.2/debug/map.h:77:20: error: dependent using declaration resolved to type without 'typename' using _Base::value_compare; ^ N.B.: Take care when you actually use the debug versions of any libstdc++ header. They are more likely to contain problems, because they are exercised far less often, and since the standard library complexity guarantees don't always apply anymore, compile times can drastically increase. Modified: stable/9/contrib/libstdc++/include/debug/map.h stable/9/contrib/libstdc++/include/debug/multimap.h Directory Properties: stable/9/contrib/libstdc++/ (props changed) Modified: stable/9/contrib/libstdc++/include/debug/map.h ============================================================================== --- stable/9/contrib/libstdc++/include/debug/map.h Fri Dec 30 22:54:19 2011 (r229045) +++ stable/9/contrib/libstdc++/include/debug/map.h Fri Dec 30 22:59:00 2011 (r229046) @@ -74,8 +74,6 @@ namespace __debug typedef std::reverse_iterator reverse_iterator; typedef std::reverse_iterator const_reverse_iterator; - using _Base::value_compare; - // 23.3.1.1 construct/copy/destroy: explicit map(const _Compare& __comp = _Compare(), const _Allocator& __a = _Allocator()) Modified: stable/9/contrib/libstdc++/include/debug/multimap.h ============================================================================== --- stable/9/contrib/libstdc++/include/debug/multimap.h Fri Dec 30 22:54:19 2011 (r229045) +++ stable/9/contrib/libstdc++/include/debug/multimap.h Fri Dec 30 22:59:00 2011 (r229046) @@ -74,8 +74,6 @@ namespace __debug typedef std::reverse_iterator reverse_iterator; typedef std::reverse_iterator const_reverse_iterator; - using _Base::value_compare; - // 23.3.1.1 construct/copy/destroy: explicit multimap(const _Compare& __comp = _Compare(), const _Allocator& __a = _Allocator())