Date: Wed, 7 Dec 2011 21:00:33 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228328 - head/contrib/libstdc++/include/debug Message-ID: <201112072100.pB7L0XXd055349@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Wed Dec 7 21:00:33 2011 New Revision: 228328 URL: http://svn.freebsd.org/changeset/base/228328 Log: 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. MFC after: 2 weeks Modified: head/contrib/libstdc++/include/debug/map.h head/contrib/libstdc++/include/debug/multimap.h Modified: head/contrib/libstdc++/include/debug/map.h ============================================================================== --- head/contrib/libstdc++/include/debug/map.h Wed Dec 7 19:43:04 2011 (r228327) +++ head/contrib/libstdc++/include/debug/map.h Wed Dec 7 21:00:33 2011 (r228328) @@ -74,8 +74,6 @@ namespace __debug typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<const_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: head/contrib/libstdc++/include/debug/multimap.h ============================================================================== --- head/contrib/libstdc++/include/debug/multimap.h Wed Dec 7 19:43:04 2011 (r228327) +++ head/contrib/libstdc++/include/debug/multimap.h Wed Dec 7 21:00:33 2011 (r228328) @@ -74,8 +74,6 @@ namespace __debug typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<const_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())
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112072100.pB7L0XXd055349>