From 8e35b647c3c9231c78e52845e1a2298880bda03e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 17 Apr 2023 22:57:38 +0100
Subject: [PATCH] Use std::unordered_map<> in private wxWebRequest headers

Replace wx synonym with the direct use of the standard class.
---
 include/wx/private/webrequest.h      |  4 ++--
 include/wx/private/webrequest_curl.h | 10 ++++------
 tests/net/webrequest.cpp             |  3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/wx/private/webrequest.h b/include/wx/private/webrequest.h
index 235727232b..718953c772 100644
--- a/include/wx/private/webrequest.h
+++ b/include/wx/private/webrequest.h
@@ -11,13 +11,13 @@
 #define _WX_PRIVATE_WEBREQUEST_H_
 
 #include "wx/ffile.h"
-#include "wx/hashmap.h"
 
 #include "wx/private/refcountermt.h"
 
 #include <memory>
+#include <unordered_map>
 
-WX_DECLARE_STRING_HASH_MAP(wxString, wxWebRequestHeaderMap);
+using wxWebRequestHeaderMap = std::unordered_map<wxString, wxString>;
 
 // Default buffer size when a fixed-size buffer must be used.
 const int wxWEBREQUEST_BUFFER_SIZE = 64 * 1024;
diff --git a/include/wx/private/webrequest_curl.h b/include/wx/private/webrequest_curl.h
index 589912e741..9eeea7c087 100644
--- a/include/wx/private/webrequest_curl.h
+++ b/include/wx/private/webrequest_curl.h
@@ -17,10 +17,11 @@
 #include "wx/thread.h"
 #include "wx/vector.h"
 #include "wx/timer.h"
-#include "wx/hashmap.h"
 
 #include "curl/curl.h"
 
+#include <unordered_map>
+
 class wxWebRequestCURL;
 class wxWebResponseCURL;
 class wxWebSessionCURL;
@@ -171,11 +172,8 @@ private:
     void StopActiveTransfer(CURL*);
     void RemoveActiveSocket(CURL*);
 
-    WX_DECLARE_HASH_MAP(CURL*, wxWebRequestCURL*, wxPointerHash, \
-                        wxPointerEqual, TransferSet);
-
-    WX_DECLARE_HASH_MAP(CURL*, curl_socket_t, wxPointerHash, \
-                        wxPointerEqual, CurlSocketMap);
+    using TransferSet = std::unordered_map<CURL*, wxWebRequestCURL*>;
+    using CurlSocketMap = std::unordered_map<CURL*, curl_socket_t>;
 
     TransferSet m_activeTransfers;
     CurlSocketMap m_activeSockets;
diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp
index 071c217f6e..129c93aa13 100644
--- a/tests/net/webrequest.cpp
+++ b/tests/net/webrequest.cpp
@@ -24,6 +24,7 @@
 #include "wx/wfstream.h"
 
 #include <memory>
+#include <unordered_map>
 
 // This test uses httpbin service and by default uses the mirror at the
 // location below, which seems to be more reliable than the main site at
@@ -540,7 +541,7 @@ TEST_CASE_METHOD(RequestFixture,
     }
 }
 
-WX_DECLARE_STRING_HASH_MAP(wxString, wxWebRequestHeaderMap);
+using wxWebRequestHeaderMap = std::unordered_map<wxString, wxString>;
 
 namespace wxPrivate
 {