diff options
| author | Jan Hubicka <jh@suse.cz> | 2009-05-02 16:14:29 +0000 |
|---|---|---|
| committer | Jan Hubicka <jh@suse.cz> | 2009-05-02 16:14:29 +0000 |
| commit | 319ec645fe0a5c97a5e73e38cb68c00aa04ca418 (patch) | |
| tree | 13e34e8c1ce862421dde0fc1fdbdd6ac34157341 /libstdc++-v3 | |
| parent | 32d96f9b8b28876cdb4bac658a55828deac83976 (diff) | |
Merge from mainline.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/pretty-ipa@147063 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1_impl/functional_hash.h | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7e4f7322881..64a94ec81ed 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-05-02 Jan Hubicka <jh@suse.cz> + + * include/tr1_impl/functional_hash.h (explicit specializations of () + operator): Mark pure. + 2009-04-30 Jonathan Wakely <jwakely.gcc@gmail.com> * scripts/create_testsuite_files: Remove thread directory. diff --git a/libstdc++-v3/include/tr1_impl/functional_hash.h b/libstdc++-v3/include/tr1_impl/functional_hash.h index 665168c0f5f..0b963e00f17 100644 --- a/libstdc++-v3/include/tr1_impl/functional_hash.h +++ b/libstdc++-v3/include/tr1_impl/functional_hash.h @@ -157,25 +157,25 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 /// Explicit specializations for long double. template<> - size_t + _GLIBCXX_PURE size_t hash<long double>::operator()(long double __val) const; /// Explicit specialization of member operator for non-builtin types. template<> - size_t + _GLIBCXX_PURE size_t hash<string>::operator()(string) const; template<> - size_t + _GLIBCXX_PURE size_t hash<const string&>::operator()(const string&) const; #ifdef _GLIBCXX_USE_WCHAR_T template<> - size_t + _GLIBCXX_PURE size_t hash<wstring>::operator()(wstring) const; template<> - size_t + _GLIBCXX_PURE size_t hash<const wstring&>::operator()(const wstring&) const; #endif |