From f369fbd6f7d2b0c74d482511bb16afbfc7856d11 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 4 Sep 2022 23:05:10 -0500 Subject: Issue #2000 - Stop using deprecated ext/hash_map. This has been long deprecated in favor of std::unsorted_map. Since all platforms are using modern compilers now it should not be a problem to switch over to std::unsorted_map in the single place hash_map is used. This allows us to build on platforms which have removed hash_map such as FreeBSD. --- ipc/chromium/src/base/file_path.h | 23 -------- ipc/chromium/src/base/hash_tables.h | 111 ------------------------------------ ipc/chromium/src/base/id_map.h | 4 +- 3 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 ipc/chromium/src/base/hash_tables.h diff --git a/ipc/chromium/src/base/file_path.h b/ipc/chromium/src/base/file_path.h index 42708a5241..eda2596d2d 100644 --- a/ipc/chromium/src/base/file_path.h +++ b/ipc/chromium/src/base/file_path.h @@ -70,7 +70,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/hash_tables.h" // Windows-style drive letter support and pathname separator characters can be // enabled and disabled independently, to aid testing. These #defines are @@ -251,26 +250,4 @@ class FilePath { #define FILE_PATH_LITERAL(x) L ## x #endif // OS_WIN -// Implement hash function so that we can use FilePaths in hashsets and maps. -#if defined(COMPILER_GCC) -namespace __gnu_cxx { - -template<> -struct hash { - size_t operator()(const FilePath& f) const { - return hash()(f.value()); - } -}; - -} // namespace __gnu_cxx -#elif defined(COMPILER_MSVC) -namespace stdext { - -inline size_t hash_value(const FilePath& f) { - return hash_value(f.value()); -} - -} // namespace stdext -#endif // COMPILER - #endif // BASE_FILE_PATH_H_ diff --git a/ipc/chromium/src/base/hash_tables.h b/ipc/chromium/src/base/hash_tables.h deleted file mode 100644 index 1df618f43e..0000000000 --- a/ipc/chromium/src/base/hash_tables.h +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// - -// -// Deal with the differences between Microsoft and GNU implemenations -// of hash_map. Allows all platforms to use |base::hash_map| and -// |base::hash_set|. -// eg: -// base::hash_map my_map; -// base::hash_set my_set; -// - -#ifndef BASE_HASH_TABLES_H_ -#define BASE_HASH_TABLES_H_ - -#include "build/build_config.h" - -#include "base/string16.h" - -#if defined(COMPILER_MSVC) -#pragma push_macro("_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS") -#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS - -#include -#include - -#pragma pop_macro("_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS") - -namespace base { -using stdext::hash_map; -using stdext::hash_set; -} -#elif defined(COMPILER_GCC) -// This is a hack to disable the gcc 4.4 warning about hash_map and hash_set -// being deprecated. We can get rid of this when we upgrade to VS2008 and we -// can use and . -#ifdef __DEPRECATED -#define CHROME_OLD__DEPRECATED __DEPRECATED -#undef __DEPRECATED -#endif - -#include -#include -#include - -#ifdef CHROME_OLD__DEPRECATED -#define __DEPRECATED CHROME_OLD__DEPRECATED -#undef CHROME_OLD__DEPRECATED -#endif - -namespace base { -using __gnu_cxx::hash_map; -using __gnu_cxx::hash_set; -} // namespace base - -namespace __gnu_cxx { - -// The GNU C++ library provides identiy hash functions for many integral types, -// but not for |long long|. This hash function will truncate if |size_t| is -// narrower than |long long|. This is probably good enough for what we will -// use it for. - -#define DEFINE_TRIVIAL_HASH(integral_type) \ - template<> \ - struct hash { \ - std::size_t operator()(integral_type value) const { \ - return static_cast(value); \ - } \ - } - -DEFINE_TRIVIAL_HASH(long long); -DEFINE_TRIVIAL_HASH(unsigned long long); - -#undef DEFINE_TRIVIAL_HASH - -// Implement string hash functions so that strings of various flavors can -// be used as keys in STL maps and sets. The hash algorithm comes from the -// GNU C++ library, in . It is duplicated here because GCC -// versions prior to 4.3.2 are unable to compile when RTTI -// is disabled, as it is in our build. - -#define DEFINE_STRING_HASH(string_type) \ - template<> \ - struct hash { \ - std::size_t operator()(const string_type& s) const { \ - std::size_t result = 0; \ - for (string_type::const_iterator i = s.begin(); i != s.end(); ++i) \ - result = (result * 131) + *i; \ - return result; \ - } \ - } - -DEFINE_STRING_HASH(std::string); -DEFINE_STRING_HASH(std::wstring); - -#if defined(WCHAR_T_IS_UTF32) -// If string16 and std::wstring are not the same type, provide a -// specialization for string16. -DEFINE_STRING_HASH(string16); -#endif // WCHAR_T_IS_UTF32 - -#undef DEFINE_STRING_HASH - -} // namespace __gnu_cxx - -#endif // COMPILER - -#endif // BASE_HASH_TABLES_H_ diff --git a/ipc/chromium/src/base/id_map.h b/ipc/chromium/src/base/id_map.h index 6e15d504e7..bc69b0f041 100644 --- a/ipc/chromium/src/base/id_map.h +++ b/ipc/chromium/src/base/id_map.h @@ -7,8 +7,8 @@ #define BASE_ID_MAP_H__ #include "base/basictypes.h" -#include "base/hash_tables.h" #include "base/logging.h" +#include // This object maintains a list of IDs that can be quickly converted to // pointers to objects. It is implemented as a hash table, optimized for @@ -21,7 +21,7 @@ template class IDMap { private: - typedef base::hash_map HashTable; + typedef std::unordered_map HashTable; typedef typename HashTable::iterator iterator; public: -- cgit v1.2.3