diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-03-03 02:01:56 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-03-03 02:01:56 +0000 |
| commit | 95addb1b84b8912649a842b3185173d61a532f81 (patch) | |
| tree | d8ce7ea18f80b87198a51c0a189f12c00a168220 /libstdc++-v3 | |
| parent | 055f6a476cc87ede98951518dc34f9a80c4f2ea2 (diff) | |
| download | gcc-95addb1b84b8912649a842b3185173d61a532f81.tar.gz | |
bitset (hash): Minor tweaks.
2010-03-02 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/bitset (hash): Minor tweaks.
* include/debug/vector (hash): Likewise.
* include/profile/bitset (hash): Likewise.
* include/profile/vector (hash): Likewise.
From-SVN: r157186
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/bitset | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/vector | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/profile/bitset | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/profile/vector | 4 |
5 files changed, 17 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f8c19e4d3aa..3b302704360 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2010-03-02 Paolo Carlini <paolo.carlini@oracle.com> + * 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 <paolo.carlini@oracle.com> + * include/bits/functional_hash.h (_Fnv_hash_base<>::hash): Change to template. * include/tr1/functional_hash.h (_Fnv_hash_base<>::hash): Likewise. diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index 034505d2c89..f452062e154 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<size_t _Nb> - struct hash<std::__debug::bitset<_Nb>> - : public std::unary_function<std::__debug::bitset<_Nb>, 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 e3caef5f60b..c360197fe8c 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -542,10 +542,10 @@ namespace __debug /// std::hash specialization for vector<bool>. template<typename _Alloc> struct hash<__debug::vector<bool, _Alloc>> - : public std::unary_function<std::__debug::vector<bool, _Alloc>, size_t> + : public std::unary_function<__debug::vector<bool, _Alloc>, size_t> { size_t - operator()(const std::__debug::vector<bool, _Alloc>& __b) const + operator()(const __debug::vector<bool, _Alloc>& __b) const { return std::hash<_GLIBCXX_STD_D::vector<bool, _Alloc>>() (__b._M_base()); } }; diff --git a/libstdc++-v3/include/profile/bitset b/libstdc++-v3/include/profile/bitset index fb47566ec28..f6b8249a321 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<size_t _Nb> - struct hash<std::__profile::bitset<_Nb>> - : public std::unary_function<std::__profile::bitset<_Nb>, 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 f7c18713544..ad74137583c 100644 --- a/libstdc++-v3/include/profile/vector +++ b/libstdc++-v3/include/profile/vector @@ -467,10 +467,10 @@ namespace __profile /// std::hash specialization for vector<bool>. template<typename _Alloc> struct hash<__profile::vector<bool, _Alloc>> - : public std::unary_function<std::__profile::vector<bool, _Alloc>, size_t> + : public std::unary_function<__profile::vector<bool, _Alloc>, size_t> { size_t - operator()(const std::__profile::vector<bool, _Alloc>& __b) const + operator()(const __profile::vector<bool, _Alloc>& __b) const { return std::hash<_GLIBCXX_STD_D::vector<bool, _Alloc>>() (__b._M_base()); } }; |