diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a87995c25e7a..b1f673c1a43f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,19 @@ +2010-03-02 Paolo Carlini + + * include/bits/stl_bvector.h (hash>): Add. + * include/debug/vector (hash<__debug::vector>): + Likewise. + * include/profile/vector (hash<__profile::vector>): + Likewise. + * testsuite/23_containers/vector/bool/hash/1.cc: New. + + * include/std/bitset (hash>): Small tweaks. + (hash>): Add. + * include/debug/bitset (hash<__debug::bitset<_Nb>>): Forward to + hash>. + * include/profile/bitset (hash<__profile::bitset<_Nb>>): Likewise. + * testsuite/23_containers/bitset/hash/1.cc: Improve. + 2010-03-02 Jonathan Wakely PR libstdc++/43230 @@ -7,9 +23,9 @@ 2010-03-02 Paolo Carlini * include/std/bitset (_Base_bitset<>::_M_getdata()): Add. - (hash<_GLIBCXX_STD_D::bitset<_Nb>>): Add, use the latter. - * include/debug/bitset (hash>): Add. - * include/profile/bitset (hash>): Likewise. + (hash>): Add, use the latter. + * include/debug/bitset (hash<__debug::bitset<_Nb>>): Add. + * include/profile/bitset (hash<__profile::bitset<_Nb>>): Likewise. * testsuite/23_containers/bitset/hash/1.cc: New. 2010-03-02 Jonathan Wakely diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index cce04841aec0..c7a4acdc084c 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -475,6 +475,10 @@ template { typedef _Bvector_base<_Alloc> _Base; +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + template friend class hash; +#endif + public: typedef bool value_type; typedef size_t size_type; @@ -1024,4 +1028,60 @@ template _GLIBCXX_END_NESTED_NAMESPACE +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + +#include + +_GLIBCXX_BEGIN_NAMESPACE(std) + + // DR 1182. + /// std::hash specialization for vector. + template + struct hash<_GLIBCXX_STD_D::vector> + : public std::unary_function<_GLIBCXX_STD_D::vector, size_t> + { + size_t + operator()(const _GLIBCXX_STD_D::vector& __b) const; + }; + + template + size_t + hash<_GLIBCXX_STD_D::vector>:: + operator()(const _GLIBCXX_STD_D::vector& __b) const + { + size_t __hash = 0; + using _GLIBCXX_STD_D::_S_word_bit; + using _GLIBCXX_STD_D::_Bit_type; + + const size_t __words = __b.size() / _S_word_bit; + if (__words) + { + const char* __data + = reinterpret_cast(__b._M_impl._M_start._M_p); + const size_t __size = __words * sizeof(_Bit_type); + __hash = std::_Fnv_hash::hash(__data, __size); + } + + const size_t __extrabits = __b.size() % _S_word_bit; + if (__extrabits) + { + _Bit_type __hiword = *__b._M_impl._M_finish._M_p; + __hiword &= ~((~static_cast<_Bit_type>(0)) << __extrabits); + + const char* __data = reinterpret_cast(&__hiword); + const size_t __size + = (__extrabits + __CHAR_BIT__ - 1) / __CHAR_BIT__; + if (__words) + __hash = std::_Fnv_hash::hash(__data, __size, __hash); + else + __hash = std::_Fnv_hash::hash(__data, __size); + } + + return __hash; + } + +_GLIBCXX_END_NAMESPACE + +#endif // __GXX_EXPERIMENTAL_CXX0X__ + #endif diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index d611892e6808..034505d2c89b 100644 --- a/libstdc++-v3/include/debug/bitset +++ b/libstdc++-v3/include/debug/bitset @@ -389,10 +389,7 @@ namespace __debug { size_t operator()(const std::__debug::bitset<_Nb>& __b) const - { - const size_t __size = (_Nb + __CHAR_BIT__ - 1) / __CHAR_BIT__; - return std::_Fnv_hash::hash(__b._M_base()._M_getdata(), __size); - } + { 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 ca326e4194df..e3caef5f60bd 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -536,6 +536,21 @@ namespace __debug { __lhs.swap(__rhs); } } // namespace __debug + +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + // DR 1182. + /// std::hash specialization for vector. + template + struct hash<__debug::vector> + : public std::unary_function, size_t> + { + size_t + operator()(const std::__debug::vector& __b) const + { return std::hash<_GLIBCXX_STD_D::vector>() + (__b._M_base()); } + }; +#endif + } // namespace std #endif diff --git a/libstdc++-v3/include/profile/bitset b/libstdc++-v3/include/profile/bitset index 3a988b5b4378..fb47566ec285 100644 --- a/libstdc++-v3/include/profile/bitset +++ b/libstdc++-v3/include/profile/bitset @@ -363,10 +363,7 @@ namespace __profile { size_t operator()(const std::__profile::bitset<_Nb>& __b) const - { - const size_t __size = (_Nb + __CHAR_BIT__ - 1) / __CHAR_BIT__; - return std::_Fnv_hash::hash(__b._M_base()._M_getdata(), __size); - } + { 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 ba4d5e70cd5a..f7c18713544a 100644 --- a/libstdc++-v3/include/profile/vector +++ b/libstdc++-v3/include/profile/vector @@ -461,7 +461,21 @@ namespace __profile #endif } // namespace __profile - using _GLIBCXX_STD_D::_S_word_bit; + +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + // DR 1182. + /// std::hash specialization for vector. + template + struct hash<__profile::vector> + : public std::unary_function, size_t> + { + size_t + operator()(const std::__profile::vector& __b) const + { return std::hash<_GLIBCXX_STD_D::vector>() + (__b._M_base()); } + }; +#endif + } // namespace std #endif diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 23a2e157c018..7372639c58a8 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -552,12 +552,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) return *new _WordT; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - const char* - _M_getdata() const - { return reinterpret_cast(&_M_getword(0)); } -#endif - _WordT _M_hiword() const { return 0; } @@ -1493,8 +1487,11 @@ _GLIBCXX_END_NESTED_NAMESPACE #undef _GLIBCXX_BITSET_BITS_PER_WORD #ifdef __GXX_EXPERIMENTAL_CXX0X__ -namespace std -{ + +#include + +_GLIBCXX_BEGIN_NAMESPACE(std) + // DR 1182. /// std::hash specialization for bitset. template @@ -1508,7 +1505,18 @@ namespace std return std::_Fnv_hash::hash(__b._M_getdata(), __size); } }; -} + + template<> + struct hash<_GLIBCXX_STD_D::bitset<0>> + : public std::unary_function<_GLIBCXX_STD_D::bitset<0>, size_t> + { + size_t + operator()(const _GLIBCXX_STD_D::bitset<0>&) const + { return 0; } + }; + +_GLIBCXX_END_NAMESPACE + #endif // __GXX_EXPERIMENTAL_CXX0X__ #ifdef _GLIBCXX_DEBUG diff --git a/libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc index 84dc31aba4a4..655192e4e8fd 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc @@ -1,4 +1,3 @@ -// { dg-do compile } // { dg-options "-std=gnu++0x" } // Copyright (C) 2010 Free Software Foundation, Inc. @@ -20,8 +19,27 @@ #include -// bitset hash -std::hash> h1; -std::hash> h2; -std::hash> h3; -std::hash> h4; +void test01() +{ + std::bitset<0> b0; + std::hash> h0; + h0(b0); + + std::bitset<10> b1; + std::hash> h1; + h1(b1); + + std::bitset<100> b2; + std::hash> h2; + h2(b2); + + std::bitset<1000> b3; + std::hash> h3; + h3(b3); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/hash/1.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/hash/1.cc new file mode 100644 index 000000000000..85e91e98ed77 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/hash/1.cc @@ -0,0 +1,45 @@ +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2010 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +void test01() +{ + std::vector b0; + std::hash> h0; + h0(b0); + + std::vector b1(10); + std::hash> h1; + h1(b1); + + std::vector b2(100); + std::hash> h2; + h2(b2); + + std::vector b3(1000); + std::hash> h3; + h3(b3); +} + +int main() +{ + test01(); + return 0; +}