diff options
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_process.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index c861a9ea51..b5693751c3 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -78,7 +78,7 @@ private: std::array<DebugWatchpoint, Core::Hardware::NUM_WATCHPOINTS> m_watchpoints{}; std::map<KProcessAddress, u64> m_debug_page_refcounts{}; #ifdef HAS_NCE - ankerl::unordered_dense::map<u64, u64> m_post_handlers{}; + ::Common::unordered_map<u64, u64> m_post_handlers{}; #endif std::unique_ptr<Core::ExclusiveMonitor> m_exclusive_monitor; Core::Memory::Memory m_memory; @@ -494,7 +494,7 @@ public: static void Switch(KernelCore& kernel, KProcess* cur_process, KProcess* next_process); #ifdef HAS_NCE - ankerl::unordered_dense::map<u64, u64>& GetPostHandlers() noexcept { + ::Common::unordered_map<u64, u64>& GetPostHandlers() noexcept { return m_post_handlers; } #endif diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index a739e7020c..4f1d849209 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -10,7 +10,8 @@ #include <functional> #include <memory> #include <thread> -#include <ankerl/unordered_dense.h> +#include "common/container/unordered_map.h" +#include "common/container/unordered_set.h" #include <utility> #include "common/assert.h" @@ -792,8 +793,8 @@ struct KernelCore::Impl { std::optional<KObjectNameGlobalData> object_name_global_data; - ankerl::unordered_dense::set<KAutoObject*> registered_objects; - ankerl::unordered_dense::set<KAutoObject*> registered_in_use_objects; + ::Common::unordered_set<KAutoObject*> registered_objects; + ::Common::unordered_set<KAutoObject*> registered_in_use_objects; std::mutex server_lock; std::vector<std::unique_ptr<Service::ServerManager>> server_managers; diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 04790c8b38..2d44654f4d 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -11,7 +11,7 @@ #include <list> #include <memory> #include <string> -#include <ankerl/unordered_dense.h> +#include "common/container/unordered_map.h" #include <vector> #include "common/polyfill_thread.h" |
