From 2c4ebe03a0723634713d25ac4001acd8a93a206f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 7 Dec 2011 21:00:33 +0000 Subject: [PATCH] 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 --- contrib/libstdc++/include/debug/map.h | 2 -- contrib/libstdc++/include/debug/multimap.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/contrib/libstdc++/include/debug/map.h b/contrib/libstdc++/include/debug/map.h index 96591ca15c8..174d3c723d3 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 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()) diff --git a/contrib/libstdc++/include/debug/multimap.h b/contrib/libstdc++/include/debug/multimap.h index cbd6704520f..7dcbb3def1b 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 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())