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 +#include -WX_DECLARE_STRING_HASH_MAP(wxString, wxWebRequestHeaderMap); +using wxWebRequestHeaderMap = std::unordered_map; // 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 + 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; + using CurlSocketMap = std::unordered_map; TransferSet m_activeTransfers; CurlSocketMap m_activeSockets;