de196e5dd8
There are a lot of things in the C++ standard library which were deprecated in C++11, and more in C++17. Some of them were removed after deprecation and are no longer present in the standard at all. We have not removed these from libstdc++ because keeping them as non-standard extensions is conforming, and avoids gratuitously breaking user code, and in some cases we need to keep using them to avoid ABI changes. But we should at least give a warning for using them. That has not been done previously because of the library's own uses of them (e.g. the std::iterator class template used as a base class). This adds deprecated attributes to the relevant components, and then goes through the whole library to add diagnostic pragmas where needed to suppress warnings about our internal uses of them. The tests are updated to either expect the additional warnings, or to suppress them where we aren't interested in them. libstdc++-v3/ChangeLog: PR libstdc++/91260 PR libstdc++/91383 PR libstdc++/95065 * include/backward/binders.h (bind1st, bind2nd): Add deprecated attribute. * include/bits/refwrap.h (_Maybe_unary_or_binary_function): Disable deprecated warnings for base classes. (_Reference_wrapper_base): Likewise. * include/bits/shared_ptr_base.h (_Sp_owner_less): Likewise. * include/bits/stl_bvector.h (_Bit_iterator_base): Likewise. * include/bits/stl_function.h (unary_function, binary_function): Add deprecated attribute. (unary_negate, not1, binary_negate, not2, ptr_fun) (pointer_to_unary_function, pointer_to_binary_function) (mem_fun_t, const_mem_fun_t, mem_fun_ref_t, const_mem_fun_ref_t) (mem_fun1_t, const_mem_fun1_t, mem_fun_ref1_t) (const_mem_fun1_ref_t, mem_fun, mem_fun_ref): Add deprecated attributes. * include/bits/stl_iterator.h: Disable deprecated warnings for std::iterator base classes. * include/bits/stl_iterator_base_types.h (iterator): Add deprecated attribute. * include/bits/stl_map.h (map::value_compare): Disable deprecated warnings for base class. * include/bits/stl_multimap.h (multimap::value_compare): Likewise. * include/bits/stl_raw_storage_iter.h (raw_storage_iterator): Add deprecated attribute. * include/bits/stl_tempbuf.h (get_temporary_buffer): Likewise. * include/bits/stream_iterator.h: Disable deprecated warnings. * include/bits/streambuf_iterator.h: Likewise. * include/ext/bitmap_allocator.h: Remove unary_function base classes. * include/ext/functional: Disable deprecated warnings. * include/ext/rope: Likewise. * include/ext/throw_allocator.h: Likewise. * include/std/type_traits (result_of): Add deprecated attribute. * include/tr1/functional: Disable deprecated warnings. * include/tr1/functional_hash.h: Likewise. * testsuite/20_util/function_objects/binders/1.cc: Add -Wno-disable-deprecations. * testsuite/20_util/function_objects/binders/3113.cc: Likewise. * testsuite/20_util/function_objects/constexpr.cc: Add dg-warning. * testsuite/20_util/raw_storage_iterator/base.cc: Likewise. * testsuite/20_util/raw_storage_iterator/dr2127.cc: Likewise. * testsuite/20_util/raw_storage_iterator/requirements/base_classes.cc: Likewise. * testsuite/20_util/raw_storage_iterator/requirements/explicit_instantiation/1.cc: Likewise. * testsuite/20_util/raw_storage_iterator/requirements/typedefs.cc: Likewise. * testsuite/20_util/reference_wrapper/24803.cc: Likewise. * testsuite/20_util/reference_wrapper/typedefs.cc: Enable for C++20 and check for absence of nested types. * testsuite/20_util/shared_ptr/comparison/less.cc: Remove std::binary_function base class. * testsuite/20_util/temporary_buffer.cc: Add dg-warning. * testsuite/21_strings/basic_string/cons/char/69092.cc: Remove std::iterator base class. * testsuite/24_iterators/back_insert_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/front_insert_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/insert_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/istream_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/istreambuf_iterator/92285.cc: Likewise. * testsuite/24_iterators/istreambuf_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/ostream_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/ostreambuf_iterator/requirements/base_classes.cc: Likewise. * testsuite/24_iterators/reverse_iterator/requirements/base_classes.cc: Likewise. * testsuite/25_algorithms/copy/34595.cc: Likewise. * testsuite/25_algorithms/minmax/3.cc: Remove std::binary_function base class. * testsuite/25_algorithms/all_of/requirements/explicit_instantiation/2.cc: Disable deprecated warnings. * testsuite/25_algorithms/all_of/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/any_of/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/any_of/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/copy_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/copy_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/count_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/count_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/find_end/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/find_end/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/find_first_of/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/find_first_of/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/find_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/find_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/find_if_not/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/find_if_not/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/for_each/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/for_each/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/is_partitioned/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/is_partitioned/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/is_permutation/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/is_permutation/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/none_of/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/none_of/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/partition/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/partition/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/partition_copy/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/partition_copy/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/partition_point/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/random_shuffle/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/random_shuffle/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/remove_copy_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/remove_copy_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/remove_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/remove_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/replace_copy_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/replace_copy_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/replace_if/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/replace_if/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/search/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/search/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/search_n/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/search_n/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/stable_partition/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/stable_partition/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/transform/requirements/explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/transform/requirements/explicit_instantiation/pod.cc: Likewise. * testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc: Add dg-warning. * testsuite/ext/pb_ds/example/priority_queue_erase_if.cc: Likewise. * testsuite/ext/pb_ds/example/priority_queue_split_join.cc: Likewise. * testsuite/tr1/3_function_objects/reference_wrapper/typedefs.cc: Disable deprecated warnings. * testsuite/tr1/6_containers/hash/requirements/base_classes.cc: Likewise. * testsuite/util/regression/trait/erase_if_fn.hpp: Remove std::unary_function base classes. * testsuite/util/testsuite_iterators.h (output_iterator_wrapper): Remove std::iterator base classes.
206 lines
6.1 KiB
C++
206 lines
6.1 KiB
C++
// TR1 functional_hash.h header -*- C++ -*-
|
|
|
|
// Copyright (C) 2007-2022 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/>.
|
|
|
|
/** @file tr1/functional_hash.h
|
|
* This is an internal header file, included by other library headers.
|
|
* Do not attempt to use it directly. @headername{tr1/functional}
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_TR1_FUNCTIONAL_HASH_H
|
|
#define _GLIBCXX_TR1_FUNCTIONAL_HASH_H 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
namespace tr1
|
|
{
|
|
// Ignore warnings about std::unary_function and std::binary_function.
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
|
|
/// Class template hash.
|
|
// Declaration of default hash functor std::tr1::hash. The types for
|
|
// which std::tr1::hash<T> is well-defined is in clause 6.3.3. of the PDTR.
|
|
template<typename _Tp>
|
|
struct hash : public std::unary_function<_Tp, size_t>
|
|
{
|
|
size_t
|
|
operator()(_Tp __val) const;
|
|
};
|
|
|
|
/// Partial specializations for pointer types.
|
|
template<typename _Tp>
|
|
struct hash<_Tp*> : public std::unary_function<_Tp*, size_t>
|
|
{
|
|
size_t
|
|
operator()(_Tp* __p) const
|
|
{ return reinterpret_cast<size_t>(__p); }
|
|
};
|
|
#pragma GCC diagnostic pop
|
|
|
|
/// Explicit specializations for integer types.
|
|
#define _TR1_hashtable_define_trivial_hash(_Tp) \
|
|
template<> \
|
|
inline size_t \
|
|
hash<_Tp>::operator()(_Tp __val) const \
|
|
{ return static_cast<size_t>(__val); }
|
|
|
|
_TR1_hashtable_define_trivial_hash(bool);
|
|
_TR1_hashtable_define_trivial_hash(char);
|
|
_TR1_hashtable_define_trivial_hash(signed char);
|
|
_TR1_hashtable_define_trivial_hash(unsigned char);
|
|
_TR1_hashtable_define_trivial_hash(wchar_t);
|
|
_TR1_hashtable_define_trivial_hash(short);
|
|
_TR1_hashtable_define_trivial_hash(int);
|
|
_TR1_hashtable_define_trivial_hash(long);
|
|
_TR1_hashtable_define_trivial_hash(long long);
|
|
_TR1_hashtable_define_trivial_hash(unsigned short);
|
|
_TR1_hashtable_define_trivial_hash(unsigned int);
|
|
_TR1_hashtable_define_trivial_hash(unsigned long);
|
|
_TR1_hashtable_define_trivial_hash(unsigned long long);
|
|
|
|
#undef _TR1_hashtable_define_trivial_hash
|
|
|
|
// Fowler / Noll / Vo (FNV) Hash (type FNV-1a)
|
|
// (Used by the next specializations of std::tr1::hash.)
|
|
|
|
// N.B. These functions should work on unsigned char, otherwise they do not
|
|
// correctly implement the FNV-1a algorithm (see PR59406).
|
|
// The existing behaviour is retained for backwards compatibility.
|
|
|
|
/// Dummy generic implementation (for sizeof(size_t) != 4, 8).
|
|
template<size_t>
|
|
struct _Fnv_hash_base
|
|
{
|
|
template<typename _Tp>
|
|
static size_t
|
|
hash(const _Tp* __ptr, size_t __clength)
|
|
{
|
|
size_t __result = 0;
|
|
const char* __cptr = reinterpret_cast<const char*>(__ptr);
|
|
for (; __clength; --__clength)
|
|
__result = (__result * 131) + *__cptr++;
|
|
return __result;
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct _Fnv_hash_base<4>
|
|
{
|
|
template<typename _Tp>
|
|
static size_t
|
|
hash(const _Tp* __ptr, size_t __clength)
|
|
{
|
|
size_t __result = static_cast<size_t>(2166136261UL);
|
|
const char* __cptr = reinterpret_cast<const char*>(__ptr);
|
|
for (; __clength; --__clength)
|
|
{
|
|
__result ^= static_cast<size_t>(*__cptr++);
|
|
__result *= static_cast<size_t>(16777619UL);
|
|
}
|
|
return __result;
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct _Fnv_hash_base<8>
|
|
{
|
|
template<typename _Tp>
|
|
static size_t
|
|
hash(const _Tp* __ptr, size_t __clength)
|
|
{
|
|
size_t __result
|
|
= static_cast<size_t>(14695981039346656037ULL);
|
|
const char* __cptr = reinterpret_cast<const char*>(__ptr);
|
|
for (; __clength; --__clength)
|
|
{
|
|
__result ^= static_cast<size_t>(*__cptr++);
|
|
__result *= static_cast<size_t>(1099511628211ULL);
|
|
}
|
|
return __result;
|
|
}
|
|
};
|
|
|
|
struct _Fnv_hash
|
|
: public _Fnv_hash_base<sizeof(size_t)>
|
|
{
|
|
using _Fnv_hash_base<sizeof(size_t)>::hash;
|
|
|
|
template<typename _Tp>
|
|
static size_t
|
|
hash(const _Tp& __val)
|
|
{ return hash(&__val, sizeof(__val)); }
|
|
};
|
|
|
|
/// Explicit specializations for float.
|
|
template<>
|
|
inline size_t
|
|
hash<float>::operator()(float __val) const
|
|
{
|
|
// 0 and -0 both hash to zero.
|
|
return __val != 0.0f ? std::tr1::_Fnv_hash::hash(__val) : 0;
|
|
}
|
|
|
|
/// Explicit specializations for double.
|
|
template<>
|
|
inline size_t
|
|
hash<double>::operator()(double __val) const
|
|
{
|
|
// 0 and -0 both hash to zero.
|
|
return __val != 0.0 ? std::tr1::_Fnv_hash::hash(__val) : 0;
|
|
}
|
|
|
|
/// Explicit specializations for long double.
|
|
template<>
|
|
_GLIBCXX_PURE size_t
|
|
hash<long double>::operator()(long double __val) const;
|
|
|
|
/// Explicit specialization of member operator for non-builtin types.
|
|
template<>
|
|
_GLIBCXX_PURE size_t
|
|
hash<string>::operator()(string) const;
|
|
|
|
template<>
|
|
_GLIBCXX_PURE size_t
|
|
hash<const string&>::operator()(const string&) const;
|
|
|
|
#ifdef _GLIBCXX_USE_WCHAR_T
|
|
template<>
|
|
_GLIBCXX_PURE size_t
|
|
hash<wstring>::operator()(wstring) const;
|
|
|
|
template<>
|
|
_GLIBCXX_PURE size_t
|
|
hash<const wstring&>::operator()(const wstring&) const;
|
|
#endif
|
|
}
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
}
|
|
|
|
#endif // _GLIBCXX_TR1_FUNCTIONAL_HASH_H
|