From 640f8e65484943a0bc1c2c47cdbee438fc40b8ad Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 25 Feb 2010 13:32:52 +0000 Subject: functional_hash.h (__hash_combine): Remove. 2010-02-25 Paolo Carlini * 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): Adjust. * src/compatibility-c++0x.cc (hash): Likewise. From-SVN: r157065 --- libstdc++-v3/src/compatibility-c++0x.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libstdc++-v3/src') 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::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); } } -- cgit v1.2.3