hash-string-aux.cc: Remove.
2010-09-10 Paolo Carlini <paolo.carlini@oracle.com> * src/hash-string-aux.cc: Remove. Move contents... * src/hash_tr1.cc: ... here. * src/compatibility-c++0x.cc: ... and here. From-SVN: r164178
This commit is contained in:
parent
b636db2e16
commit
2dd3121f9e
|
@ -1,3 +1,9 @@
|
||||||
|
2010-09-10 Paolo Carlini <paolo.carlini@oracle.com>
|
||||||
|
|
||||||
|
* src/hash-string-aux.cc: Remove. Move contents...
|
||||||
|
* src/hash_tr1.cc: ... here.
|
||||||
|
* src/compatibility-c++0x.cc: ... and here.
|
||||||
|
|
||||||
2010-09-09 Paolo Carlini <paolo.carlini@oracle.com>
|
2010-09-09 Paolo Carlini <paolo.carlini@oracle.com>
|
||||||
|
|
||||||
PR libstdc++/45613
|
PR libstdc++/45613
|
||||||
|
|
|
@ -50,7 +50,29 @@ namespace std
|
||||||
// We need these due to the symbols exported since GLIBCXX_3.4.10.
|
// We need these due to the symbols exported since GLIBCXX_3.4.10.
|
||||||
// See libstdc++/41662 for details.
|
// See libstdc++/41662 for details.
|
||||||
|
|
||||||
#include "hash-string-aux.cc"
|
#ifndef _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<string>::operator()(string __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length()); }
|
||||||
|
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<const string&>::operator()(const string& __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length()); }
|
||||||
|
|
||||||
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<wstring>::operator()(wstring __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length() * sizeof(wchar_t)); }
|
||||||
|
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<const wstring&>::operator()(const wstring& __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length() * sizeof(wchar_t)); }
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
size_t
|
size_t
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
// std::hash and std::tr1::hash definitions, string bits -*- C++ -*-
|
|
||||||
|
|
||||||
// Copyright (C) 2007, 2008, 2009, 2010 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
|
|
||||||
// terms of the GNU General Public License as published by the
|
|
||||||
// Free Software Foundation; either version 3, or (at your option)
|
|
||||||
// any later version.
|
|
||||||
|
|
||||||
// This library is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
|
|
||||||
// Under Section 7 of GPL version 3, you are granted additional
|
|
||||||
// permissions described in the GCC Runtime Library Exception, version
|
|
||||||
// 3.1, as published by the Free Software Foundation.
|
|
||||||
|
|
||||||
// You should have received a copy of the GNU General Public License and
|
|
||||||
// a copy of the GCC Runtime Library Exception along with this program;
|
|
||||||
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
||||||
// <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
#ifndef _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
|
|
||||||
template<>
|
|
||||||
size_t
|
|
||||||
hash<string>::operator()(string __s) const
|
|
||||||
{ return _Fnv_hash::hash(__s.data(), __s.length()); }
|
|
||||||
|
|
||||||
template<>
|
|
||||||
size_t
|
|
||||||
hash<const string&>::operator()(const string& __s) const
|
|
||||||
{ return _Fnv_hash::hash(__s.data(), __s.length()); }
|
|
||||||
|
|
||||||
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
||||||
template<>
|
|
||||||
size_t
|
|
||||||
hash<wstring>::operator()(wstring __s) const
|
|
||||||
{ return _Fnv_hash::hash(__s.data(), __s.length() * sizeof(wchar_t)); }
|
|
||||||
|
|
||||||
template<>
|
|
||||||
size_t
|
|
||||||
hash<const wstring&>::operator()(const wstring& __s) const
|
|
||||||
{ return _Fnv_hash::hash(__s.data(), __s.length() * sizeof(wchar_t)); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -30,6 +30,29 @@ namespace std
|
||||||
namespace tr1
|
namespace tr1
|
||||||
{
|
{
|
||||||
#include "hash-long-double-aux.cc"
|
#include "hash-long-double-aux.cc"
|
||||||
#include "hash-string-aux.cc"
|
|
||||||
|
#ifndef _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<string>::operator()(string __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length()); }
|
||||||
|
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<const string&>::operator()(const string& __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length()); }
|
||||||
|
|
||||||
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<wstring>::operator()(wstring __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length() * sizeof(wchar_t)); }
|
||||||
|
|
||||||
|
template<>
|
||||||
|
size_t
|
||||||
|
hash<const wstring&>::operator()(const wstring& __s) const
|
||||||
|
{ return _Fnv_hash::hash(__s.data(), __s.length() * sizeof(wchar_t)); }
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue