hash.cc (hash<string>::operator()(string), hash<wstring>::operator()(wstring)): Do...

2009-08-07  Paolo Carlini  <paolo.carlini@oracle.com>

	* src/hash.cc (hash<string>::operator()(string),
	hash<wstring>::operator()(wstring)): Do not decorate as throwing
	nothing.
	* include/bits/functional_hash.h (hash<error_code>::
	operator()(error_code)): Likewise.

From-SVN: r150566

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c668f538db177fb220038ae489feae92a02a2d97..f6d6f507cb77e3dc8b522beb0b57090124e7aed6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * src/hash.cc (hash<string>::operator()(string),
+       hash<wstring>::operator()(wstring)): Do not decorate as throwing
+       nothing.
+       * include/bits/functional_hash.h (hash<error_code>::
+       operator()(error_code)): Likewise.
+
 2009-08-06  Benjamin Kosnik  <bkoz@redhat.com>
 
        * 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 c21abfe08b203399933104a9a32122368a0eb2a2..78b0aa3cf6659d9409ba132434c0a02a1fabc86a 100644 (file)
--- 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<error_code>::operator()(error_code) const throw ();
+    hash<error_code>::operator()(error_code) const;
 }
 
 #endif // _FUNCTIONAL_HASH_H

diff --git a/libstdc++-v3/src/hash.cc b/libstdc++-v3/src/hash.cc
index 790cfee3e22c1e05cae93f5efcd0cc04d59116a8..2c9c1130416b2a95951c1c545c0febcab7b2f2f2 100644 (file)
--- 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<string>::operator()(string __s) const throw ()
+    hash<string>::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<wstring>::operator()(wstring __s) const throw ()
+    hash<wstring>::operator()(wstring __s) const
     {
       const char* __p = reinterpret_cast<const char*>(__s.data());
       return _Fnv_hash<>::hash(__p, __s.length() * sizeof(wchar_t));