From b2776402242195848dc21483b46e5e889dcf2e1d Mon Sep 17 00:00:00 2001
From: Matthew Kosarek <matt.kosarek@canonical.com>
Date: Mon, 7 Oct 2024 11:05:38 -0400
Subject: [PATCH] SharedLibrary::Handle no longer defines the hash function in
 std

---
 include/common/mir/shared_library.h               | 15 ++++++++-------
 .../platform/mir/options/default_configuration.h  |  4 ++--
 src/common/sharedlibrary/shared_library.cpp       |  6 ------
 src/common/symbols.map                            |  9 +++++++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/common/mir/shared_library.h b/include/common/mir/shared_library.h
index 5972635e2b2..cba7bd6fb40 100644
--- a/include/common/mir/shared_library.h
+++ b/include/common/mir/shared_library.h
@@ -57,9 +57,16 @@ class SharedLibrary
         auto operator<=>(Handle const& rhs) const -> std::strong_ordering;
         auto operator==(Handle const& rhs) const -> bool = default;
         auto operator!=(Handle const& rhs) const -> bool = default;
+
+        struct HandleHash
+        {
+            std::size_t operator()(const Handle& h) const noexcept
+            {
+                return std::hash<void*>{}(h.handle);
+            }
+        };
     private:
         friend class SharedLibrary;
-        friend struct std::hash<Handle>;
 
         Handle(void* handle);
         void* handle;
@@ -75,10 +82,4 @@ class SharedLibrary
 };
 }
 
-template<>
-struct std::hash<mir::SharedLibrary::Handle>
-{
-    auto operator()(mir::SharedLibrary::Handle const& h) const noexcept -> std::size_t;
-};
-
 #endif /* MIR_SHARED_LIBRARY_H_ */
diff --git a/include/platform/mir/options/default_configuration.h b/include/platform/mir/options/default_configuration.h
index 0f60d707e07..22b6355e39a 100644
--- a/include/platform/mir/options/default_configuration.h
+++ b/include/platform/mir/options/default_configuration.h
@@ -77,8 +77,8 @@ class DefaultConfiguration : public Configuration
     std::function<void(int argc, char const* const* argv)> const unparsed_arguments_handler;
     std::shared_ptr<boost::program_options::options_description> const program_options;
 
-    std::unordered_map<SharedLibrary::Handle, boost::program_options::options_description> module_options_desc;
-    std::unordered_map<SharedLibrary::Handle, std::shared_ptr<Option>> mutable module_options;
+    std::unordered_map<SharedLibrary::Handle, boost::program_options::options_description, SharedLibrary::Handle::HandleHash> module_options_desc;
+    std::unordered_map<SharedLibrary::Handle, std::shared_ptr<Option>, SharedLibrary::Handle::HandleHash> mutable module_options;
     std::shared_ptr<Option> mutable options;
 };
 }
diff --git a/src/common/sharedlibrary/shared_library.cpp b/src/common/sharedlibrary/shared_library.cpp
index bd0b399d23c..bc5835c21d6 100644
--- a/src/common/sharedlibrary/shared_library.cpp
+++ b/src/common/sharedlibrary/shared_library.cpp
@@ -91,9 +91,3 @@ auto mir::SharedLibrary::Handle::operator<=>(Handle const& rhs) const -> std::st
 {
     return handle <=> rhs.handle;
 }
-
-auto std::hash<mir::SharedLibrary::Handle>::operator()(mir::SharedLibrary::Handle const& handle) const noexcept
-    -> std::size_t
-{
-    return std::hash<void*>{}(handle.handle);
-}
diff --git a/src/common/symbols.map b/src/common/symbols.map
index fd9aab56b75..14496e7a6da 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -691,18 +691,23 @@ global:
 };
 
 MIR_COMMON_2.18 {
-  global: extern "C++" {
+global:
+  extern "C++" {
     MirTouchpadConfig::disable_with_external_mouse*;
     mir::event_type_to_c_str*;
   };
 } MIR_COMMON_2.17;
 
 MIR_COMMON_2.19 {
-  global: extern "C++" {
+global:
+  extern "C++" {
     mir::SharedLibrary::Handle::?Handle*;
     mir::SharedLibrary::Handle::operator*;
     mir::SharedLibrary::get_handle*;
+    mir::SharedLibrary::Handle::HandleHash::operator*;
     std::hash?mir::SharedLibrary::Handle?::operator*;
     typeinfo?for?mir::SharedLibrary::Handle;
+    typeinfo?for?mir::SharedLibrary::Handle::HandleHash;
   };
 } MIR_COMMON_2.18;
+