diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-02-25 13:32:52 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-02-25 13:32:52 +0000 |
| commit | 640f8e65484943a0bc1c2c47cdbee438fc40b8ad (patch) | |
| tree | b9e6efc036872718e4cffb509db23e692c0321e5 /libstdc++-v3/src | |
| parent | 0679656478759e3bfd02f6f0a4b22fd792b736d7 (diff) | |
| download | gcc-640f8e65484943a0bc1c2c47cdbee438fc40b8ad.tar.gz gcc-640f8e65484943a0bc1c2c47cdbee438fc40b8ad.tar.bz2 gcc-640f8e65484943a0bc1c2c47cdbee438fc40b8ad.zip | |
functional_hash.h (__hash_combine): Remove.
2010-02-25 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/functional_hash.h (__hash_combine): Remove.
(_Fnv_hash_base<>::hash(const char*, size_t)): Add defaulted
hash parameter.
(_Fnv_hash::__hash_combine(const _Tp&, size_t)): Add.
* include/std/system_error (hash<system_error>): Adjust.
* src/compatibility-c++0x.cc (hash<system_error>): Likewise.
From-SVN: r157065
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/compatibility-c++0x.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/src/compatibility-c++0x.cc b/libstdc++-v3/src/compatibility-c++0x.cc index 7dd57680484..759267ab3a5 100644 --- a/libstdc++-v3/src/compatibility-c++0x.cc +++ b/libstdc++-v3/src/compatibility-c++0x.cc @@ -57,6 +57,6 @@ namespace std hash<error_code>::operator()(error_code __e) const { const size_t __tmp = std::_Fnv_hash::hash(__e._M_value); - return std::__hash_combine(__tmp, __e._M_cat); + return std::_Fnv_hash::__hash_combine(__e._M_cat, __tmp); } } |