From 71c0d8ef5d72733e87d814a7bc09bcec1b4bcdad Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 7 Aug 2009 10:13:44 +0000 Subject: [PATCH] 2009-08-07 Paolo Carlini * src/hash.cc (hash::operator()(string), hash::operator()(wstring)): Do not decorate as throwing nothing. * include/bits/functional_hash.h (hash:: operator()(error_code)): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150566 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/include/bits/functional_hash.h | 4 ++-- libstdc++-v3/src/hash.cc | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c668f53..f6d6f50 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2009-08-07 Paolo Carlini + + * src/hash.cc (hash::operator()(string), + hash::operator()(wstring)): Do not decorate as throwing + nothing. + * include/bits/functional_hash.h (hash:: + operator()(error_code)): Likewise. + 2009-08-06 Benjamin Kosnik * src/compatibility.cc: Make C++0x safe, add in explicit casts to diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h index c21abfe..78b0aa3 100644 --- a/libstdc++-v3/include/bits/functional_hash.h +++ b/libstdc++-v3/include/bits/functional_hash.h @@ -1,6 +1,6 @@ // functional_hash.h header -*- C++ -*- -// Copyright (C) 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009 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 @@ -61,7 +61,7 @@ namespace std template<> _GLIBCXX_PURE size_t - hash::operator()(error_code) const throw (); + hash::operator()(error_code) const; } #endif // _FUNCTIONAL_HASH_H diff --git a/libstdc++-v3/src/hash.cc b/libstdc++-v3/src/hash.cc index 790cfee..2c9c113 100644 --- a/libstdc++-v3/src/hash.cc +++ b/libstdc++-v3/src/hash.cc @@ -72,7 +72,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 #ifndef _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL template<> size_t - hash::operator()(string __s) const throw () + hash::operator()(string __s) const { return _Fnv_hash<>::hash(__s.data(), __s.length()); } template<> @@ -83,7 +83,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 #ifdef _GLIBCXX_USE_WCHAR_T template<> size_t - hash::operator()(wstring __s) const throw () + hash::operator()(wstring __s) const { const char* __p = reinterpret_cast(__s.data()); return _Fnv_hash<>::hash(__p, __s.length() * sizeof(wchar_t)); -- 2.7.4