diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f8c19e4d3aa0..3b3027043604 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2010-03-02 Paolo Carlini + + * include/debug/bitset (hash): Minor tweaks. + * include/debug/vector (hash): Likewise. + * include/profile/bitset (hash): Likewise. + * include/profile/vector (hash): Likewise. + 2010-03-02 Paolo Carlini * include/bits/functional_hash.h (_Fnv_hash_base<>::hash): Change diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index 034505d2c89b..f452062e1541 100644 --- a/libstdc++-v3/include/debug/bitset +++ b/libstdc++-v3/include/debug/bitset @@ -384,11 +384,11 @@ namespace __debug // DR 1182. /// std::hash specialization for bitset. template - struct hash> - : public std::unary_function, size_t> + struct hash<__debug::bitset<_Nb>> + : public std::unary_function<__debug::bitset<_Nb>, size_t> { size_t - operator()(const std::__debug::bitset<_Nb>& __b) const + operator()(const __debug::bitset<_Nb>& __b) const { return std::hash<_GLIBCXX_STD_D::bitset<_Nb>>()(__b._M_base()); } }; #endif diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index e3caef5f60bd..c360197fe8c4 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -542,10 +542,10 @@ namespace __debug /// std::hash specialization for vector. template struct hash<__debug::vector> - : public std::unary_function, size_t> + : public std::unary_function<__debug::vector, size_t> { size_t - operator()(const std::__debug::vector& __b) const + operator()(const __debug::vector& __b) const { return std::hash<_GLIBCXX_STD_D::vector>() (__b._M_base()); } }; diff --git a/libstdc++-v3/include/profile/bitset b/libstdc++-v3/include/profile/bitset index fb47566ec285..f6b8249a3219 100644 --- a/libstdc++-v3/include/profile/bitset +++ b/libstdc++-v3/include/profile/bitset @@ -358,11 +358,11 @@ namespace __profile // DR 1182. /// std::hash specialization for bitset. template - struct hash> - : public std::unary_function, size_t> + struct hash<__profile::bitset<_Nb>> + : public std::unary_function<__profile::bitset<_Nb>, size_t> { size_t - operator()(const std::__profile::bitset<_Nb>& __b) const + operator()(const __profile::bitset<_Nb>& __b) const { return std::hash<_GLIBCXX_STD_D::bitset<_Nb>>()(__b._M_base()); } }; #endif diff --git a/libstdc++-v3/include/profile/vector b/libstdc++-v3/include/profile/vector index f7c18713544a..ad74137583c9 100644 --- a/libstdc++-v3/include/profile/vector +++ b/libstdc++-v3/include/profile/vector @@ -467,10 +467,10 @@ namespace __profile /// std::hash specialization for vector. template struct hash<__profile::vector> - : public std::unary_function, size_t> + : public std::unary_function<__profile::vector, size_t> { size_t - operator()(const std::__profile::vector& __b) const + operator()(const __profile::vector& __b) const { return std::hash<_GLIBCXX_STD_D::vector>() (__b._M_base()); } };