diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-15 11:35:22 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-15 11:35:22 +0000 |
| commit | 74fa23922a189845dad4cca1e8854de624b0ca12 (patch) | |
| tree | 95f19784c581a1f85cb35235a5b5aea1f6c73e5b /libstdc++-v3/include/bits/hashtable.h | |
| parent | b6297c58cda06dc31302af6bcf3878d96fdcce33 (diff) | |
| download | gcc-74fa23922a189845dad4cca1e8854de624b0ca12.tar.gz | |
2012-05-15 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187525 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187527 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/hashtable.h')
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 9a795494916..f5bc3583f22 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -203,8 +203,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __key_extract = typename std::conditional< __constant_iterators::value, - std::_Identity<value_type>, - std::_Select1st<value_type>>::type; + __detail::_Identity, + __detail::_Select1st>::type; using __hashtable_base = __detail:: _Hashtable_base<_Key, _Value, _ExtractKey, |