diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2011-12-07 21:00:33 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2011-12-07 21:00:33 +0000 |
| commit | 2c4ebe03a0723634713d25ac4001acd8a93a206f (patch) | |
| tree | fa31d34fa0050e9bc166292fb3e7bcebb20338f8 /contrib/libstdc++/include/debug | |
| parent | 6537ffa6a98a253cc64a866bc82c5597de7e21af (diff) | |
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
Notes
Notes:
svn path=/head/; revision=228328
Diffstat (limited to 'contrib/libstdc++/include/debug')
| -rw-r--r-- | contrib/libstdc++/include/debug/map.h | 2 | ||||
| -rw-r--r-- | contrib/libstdc++/include/debug/multimap.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/contrib/libstdc++/include/debug/map.h b/contrib/libstdc++/include/debug/map.h index 96591ca15c8a..174d3c723d3b 100644 --- a/contrib/libstdc++/include/debug/map.h +++ b/contrib/libstdc++/include/debug/map.h @@ -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()) diff --git a/contrib/libstdc++/include/debug/multimap.h b/contrib/libstdc++/include/debug/multimap.h index cbd6704520f2..7dcbb3def1b6 100644 --- a/contrib/libstdc++/include/debug/multimap.h +++ b/contrib/libstdc++/include/debug/multimap.h @@ -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()) |