diff --git a/src/android/app/src/main/jni/game_metadata.cpp b/src/android/app/src/main/jni/game_metadata.cpp index e7d97e1bd9..14340112ce 100644 --- a/src/android/app/src/main/jni/game_metadata.cpp +++ b/src/android/app/src/main/jni/game_metadata.cpp @@ -20,7 +20,7 @@ struct RomMetadata { std::vector icon; bool isHomebrew; }; -static boost::container::unordered_flat_map m_rom_metadata_cache; +static boost::unordered::unordered_flat_map m_rom_metadata_cache; static RomMetadata CacheRomMetadata(const std::string& path) { auto& instance = EmulationSession::GetInstance(); diff --git a/src/android/app/src/main/jni/native_input.cpp b/src/android/app/src/main/jni/native_input.cpp index f53bc33121..0fc3c470aa 100644 --- a/src/android/app/src/main/jni/native_input.cpp +++ b/src/android/app/src/main/jni/native_input.cpp @@ -21,7 +21,7 @@ #include "input_common/drivers/virtual_gamepad.h" #include "native.h" -boost::container::unordered_flat_map> map_profiles; +boost::unordered::unordered_flat_map> map_profiles; bool IsHandheldOnly() { const auto npad_style_set = diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 2e8227e9e2..ebef50486f 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -197,8 +197,8 @@ private: SetLegacyPathImpl(legacy_path, new_path); } - boost::container::unordered_flat_map eden_paths; - boost::container::unordered_flat_map legacy_paths; + boost::unordered::unordered_flat_map eden_paths; + boost::unordered::unordered_flat_map legacy_paths; }; bool ValidatePath(const fs::path& path) { diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 3933d866f3..7b00ae3ac3 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -392,7 +392,7 @@ private: std::mutex placeholder_mutex; ///< Mutex for placeholders boost::icl::separate_interval_set placeholders; ///< Mapped placeholders - boost::container::unordered_flat_map placeholder_host_pointers; ///< Placeholder backing offset + boost::unordered::unordered_flat_map placeholder_host_pointers; ///< Placeholder backing offset }; #elif defined(__OPENORBIS__) || defined(__managarm__) diff --git a/src/common/input.h b/src/common/input.h index 7839623761..e35606c659 100644 --- a/src/common/input.h +++ b/src/common/input.h @@ -413,7 +413,7 @@ public: namespace Impl { template -using FactoryListType = boost::container::unordered_flat_map>>; +using FactoryListType = boost::unordered::unordered_flat_map>>; template struct FactoryList { diff --git a/src/common/param_package.h b/src/common/param_package.h index 95715bab32..68a5dc9d7d 100644 --- a/src/common/param_package.h +++ b/src/common/param_package.h @@ -16,7 +16,7 @@ namespace Common { /// A string-based key-value container supporting serializing to and deserializing from a string class ParamPackage { public: - using DataType = boost::container::unordered_flat_map; + using DataType = boost::unordered::unordered_flat_map; ParamPackage() = default; explicit ParamPackage(const std::string& serialized); diff --git a/src/common/x64/xbyak.h b/src/common/x64/xbyak.h index 4a3c1badcc..d374a6b00e 100644 --- a/src/common/x64/xbyak.h +++ b/src/common/x64/xbyak.h @@ -25,8 +25,8 @@ #include #include #include -#define XBYAK_STD_UNORDERED_SET boost::container::unordered_flat_set -#define XBYAK_STD_UNORDERED_MAP boost::container::unordered_flat_map +#define XBYAK_STD_UNORDERED_SET boost::unordered::unordered_flat_set +#define XBYAK_STD_UNORDERED_MAP boost::unordered::unordered_flat_map #define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap #include #include diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp index be297e5130..41ec699161 100644 --- a/src/core/file_sys/ips_layer.cpp +++ b/src/core/file_sys/ips_layer.cpp @@ -105,7 +105,7 @@ struct IPSwitchRecord { size_t count; }; struct IPSwitchCompiler::IPSwitchPatch { - boost::container::unordered_flat_map records; + boost::unordered::unordered_flat_map records; bool enabled; }; diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 910cdfa8d4..a872a5a7ef 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -566,7 +566,7 @@ VirtualFile RegisteredCache::GetFileAtID(NcaID id) const { return file; } -static std::optional CheckMapForContentRecord(const boost::container::unordered_flat_map& map, u64 title_id, ContentRecordType type) { +static std::optional CheckMapForContentRecord(const boost::unordered::unordered_flat_map& map, u64 title_id, ContentRecordType type) { auto cmnt_iter = map.find(title_id); u8 id_offset = 0; diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index a29941cf03..518d9052cc 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h @@ -78,7 +78,7 @@ private: std::array m_watchpoints{}; std::map m_debug_page_refcounts{}; #ifdef HAS_NCE - boost::container::unordered_flat_map m_post_handlers{}; + boost::unordered::unordered_flat_map m_post_handlers{}; #endif std::unique_ptr 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 - boost::container::unordered_flat_map& GetPostHandlers() noexcept { + boost::unordered::unordered_flat_map& GetPostHandlers() noexcept { return m_post_handlers; } #endif diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 41147b07f3..da57fe5b30 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -793,8 +793,8 @@ struct KernelCore::Impl { std::optional object_name_global_data; - boost::container::unordered_flat_set registered_objects; - boost::container::unordered_flat_set registered_in_use_objects; + boost::unordered::unordered_flat_set registered_objects; + boost::unordered::unordered_flat_set registered_in_use_objects; std::mutex server_lock; std::vector> server_managers; diff --git a/src/core/hle/service/am/frontend/applet_web_browser_types.h b/src/core/hle/service/am/frontend/applet_web_browser_types.h index 5d9e9fb749..a6413cc1c9 100644 --- a/src/core/hle/service/am/frontend/applet_web_browser_types.h +++ b/src/core/hle/service/am/frontend/applet_web_browser_types.h @@ -177,6 +177,6 @@ struct WebCommonReturnValue { }; static_assert(sizeof(WebCommonReturnValue) == 0x1010, "WebCommonReturnValue has incorrect size."); -using WebArgInputTLVMap = boost::container::unordered_flat_map>; +using WebArgInputTLVMap = boost::unordered::unordered_flat_map>; } // namespace Service::AM::Frontend diff --git a/src/core/hle/service/bcat/news/builtin_news.cpp b/src/core/hle/service/bcat/news/builtin_news.cpp index d286fd8620..7b282fc040 100644 --- a/src/core/hle/service/bcat/news/builtin_news.cpp +++ b/src/core/hle/service/bcat/news/builtin_news.cpp @@ -40,8 +40,8 @@ std::vector default_logo_small; std::vector default_logo_large; bool default_logos_loaded = false; -boost::container::unordered_flat_map> news_images_small; -boost::container::unordered_flat_map> news_images_large; +boost::unordered::unordered_flat_map> news_images_small; +boost::unordered::unordered_flat_map> news_images_large; std::mutex images_mutex; diff --git a/src/core/hle/service/bcat/news/news_storage.h b/src/core/hle/service/bcat/news/news_storage.h index 10045b6c5c..b64c3a47e3 100644 --- a/src/core/hle/service/bcat/news/news_storage.h +++ b/src/core/hle/service/bcat/news/news_storage.h @@ -94,7 +94,7 @@ private: static s64 Now(); mutable std::mutex mtx; - boost::container::unordered_flat_map items; + boost::unordered::unordered_flat_map items; size_t open_counter{}; }; diff --git a/src/core/hle/service/caps/caps_manager.h b/src/core/hle/service/caps/caps_manager.h index 6730b87ee2..ed458214a2 100644 --- a/src/core/hle/service/caps/caps_manager.h +++ b/src/core/hle/service/caps/caps_manager.h @@ -89,7 +89,7 @@ private: AlbumFileDateTime ConvertToAlbumDateTime(u64 posix_time) const; bool is_mounted{}; - boost::container::unordered_flat_map album_files; + boost::unordered::unordered_flat_map album_files; Core::System& system; }; diff --git a/src/core/hle/service/ldn/lan_discovery.h b/src/core/hle/service/ldn/lan_discovery.h index ee4dc4c6fe..8746a9de88 100644 --- a/src/core/hle/service/ldn/lan_discovery.h +++ b/src/core/hle/service/ldn/lan_discovery.h @@ -120,7 +120,7 @@ protected: std::array stations; std::array node_changes{}; std::array node_last_states{}; - boost::container::unordered_flat_map scan_results{}; + boost::unordered::unordered_flat_map scan_results{}; NodeInfo node_info{}; NetworkInfo network_info{}; State state{State::None}; diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 3eae4f6e3e..e8ce6cf18d 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -332,7 +332,7 @@ private: }; static_assert(sizeof(LogPacketHeader) == 0x18, "LogPacketHeader is an invalid size"); - boost::container::unordered_flat_map> entries{}; + boost::unordered::unordered_flat_map> entries{}; LogDestination destination{LogDestination::All}; }; diff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/core/hle/service/nvdrv/core/nvmap.h index 69d3ab6598..d203b82342 100644 --- a/src/core/hle/service/nvdrv/core/nvmap.h +++ b/src/core/hle/service/nvdrv/core/nvmap.h @@ -162,7 +162,7 @@ private: std::list> unmap_queue{}; std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue` - boost::container::unordered_flat_map> + boost::unordered::unordered_flat_map> handles{}; //!< Main owning map of handles std::mutex handles_lock; //!< Protects access to `handles` diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 75c4f648e7..7b8eed4ecd 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -114,7 +114,7 @@ private: }; static_assert(sizeof(IoctlRemapEntry) == 20, "IoctlRemapEntry is incorrect size"); - boost::container::unordered_flat_set map_buffer_offsets{}; + boost::unordered::unordered_flat_set map_buffer_offsets{}; struct IoctlMapBufferEx { MappingFlags flags{}; // bit0: fixed_offset, bit2: cacheable diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h index 3c0e3afae6..161f729b52 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h @@ -217,7 +217,7 @@ private: NvCore::SyncpointManager& syncpoint_manager; NvCore::NvMap& nvmap; std::shared_ptr channel_state; - boost::container::unordered_flat_map sessions; + boost::unordered::unordered_flat_map sessions; u32 channel_syncpoint; std::mutex channel_mutex; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h index 83f37c399a..2d96d7b199 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h @@ -139,7 +139,7 @@ protected: NvCore::NvMap& nvmap; NvCore::ChannelType channel_type; std::array device_syncpoints{}; - boost::container::unordered_flat_map sessions; + boost::unordered::unordered_flat_map sessions; }; }; // namespace Devices } // namespace Service::Nvidia diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/core/hle/service/nvdrv/devices/nvmap.h index 9b5f171e5d..29d542fce7 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.h +++ b/src/core/hle/service/nvdrv/devices/nvmap.h @@ -119,7 +119,7 @@ private: NvCore::Container& container; NvCore::NvMap& file; - boost::container::unordered_flat_map sessions; + boost::unordered::unordered_flat_map sessions; }; } // namespace Service::Nvidia::Devices diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h index bfbee43c02..7187d5afb0 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/core/hle/service/nvdrv/nvdrv.h @@ -104,7 +104,7 @@ private: /// Id to use for the next open file descriptor. DeviceFD next_fd = 1; - using FilesContainerType = boost::container::unordered_flat_map>; + using FilesContainerType = boost::unordered::unordered_flat_map>; /// Mapping of file descriptors to the devices they reference. FilesContainerType open_files; @@ -112,7 +112,7 @@ private: EventInterface events_interface; - boost::container::unordered_flat_map> builders; + boost::unordered::unordered_flat_map> builders; }; void LoopProcess(Core::System& system); diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h index 3178f58e23..3cc98e8b9b 100644 --- a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h +++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h @@ -40,8 +40,8 @@ private: mutable std::mutex lock; s32 last_id = 0; - boost::container::unordered_flat_map> binders; - boost::container::unordered_flat_map refcounts; + boost::unordered::unordered_flat_map> binders; + boost::unordered::unordered_flat_map refcounts; }; } // namespace Service::Nvnflinger diff --git a/src/core/hle/service/olsc/daemon_controller.h b/src/core/hle/service/olsc/daemon_controller.h index 6137449ae0..5945e0dcfb 100644 --- a/src/core/hle/service/olsc/daemon_controller.h +++ b/src/core/hle/service/olsc/daemon_controller.h @@ -57,10 +57,10 @@ private: } }; - boost::container::unordered_flat_map app_auto_transfer_{}; - boost::container::unordered_flat_map global_auto_upload_{}; - boost::container::unordered_flat_map global_auto_download_{}; - boost::container::unordered_flat_map autonomy_task_status_{}; + boost::unordered::unordered_flat_map app_auto_transfer_{}; + boost::unordered::unordered_flat_map global_auto_upload_{}; + boost::unordered::unordered_flat_map global_auto_download_{}; + boost::unordered::unordered_flat_map autonomy_task_status_{}; }; } // namespace Service::OLSC diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 7241ec4422..b421f2de81 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -100,8 +100,8 @@ private: void ReportUnimplementedFunction(HLERequestContext& ctx, const FunctionInfoBase* info); protected: - boost::container::unordered_flat_map handlers; - boost::container::unordered_flat_map handlers_tipc; + boost::unordered::unordered_flat_map handlers; + boost::unordered::unordered_flat_map handlers_tipc; /// Used to gain exclusive access to the service members, e.g. from CoreTiming thread. std::mutex lock_service; /// System context that the service operates under. diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index 438500b299..93f8cc3443 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -101,8 +101,8 @@ private: /// Map of registered services, retrieved using GetServicePort. mutable std::mutex lock; - boost::container::unordered_flat_map registered_services; - boost::container::unordered_flat_map service_ports; + boost::unordered::unordered_flat_map registered_services; + boost::unordered::unordered_flat_map service_ports; /// Kernel context Kernel::KernelCore& kernel; diff --git a/src/core/hle/service/vi/conductor.h b/src/core/hle/service/vi/conductor.h index 02ef475c42..49a80009c5 100644 --- a/src/core/hle/service/vi/conductor.h +++ b/src/core/hle/service/vi/conductor.h @@ -50,7 +50,7 @@ private: private: Core::System& m_system; Container& m_container; - boost::container::unordered_flat_map m_vsync_managers; + boost::unordered::unordered_flat_map m_vsync_managers; std::shared_ptr m_event; Common::Event m_signal; std::jthread m_thread; diff --git a/src/dynarmic/src/dynarmic/backend/arm64/address_space.cpp b/src/dynarmic/src/dynarmic/backend/arm64/address_space.cpp index 7c62c3aef4..bb37871124 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/address_space.cpp +++ b/src/dynarmic/src/dynarmic/backend/arm64/address_space.cpp @@ -75,7 +75,7 @@ CodePtr AddressSpace::GetOrEmit(IR::LocationDescriptor descriptor) { return block_info.entry_point; } -void AddressSpace::InvalidateBasicBlocks(const boost::container::unordered_flat_set& descriptors) { +void AddressSpace::InvalidateBasicBlocks(const boost::unordered::unordered_flat_set& descriptors) { UnprotectCodeMemory(); for (const auto& descriptor : descriptors) { diff --git a/src/dynarmic/src/dynarmic/backend/arm64/address_space.h b/src/dynarmic/src/dynarmic/backend/arm64/address_space.h index bca7a3c286..9b563bc368 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/address_space.h +++ b/src/dynarmic/src/dynarmic/backend/arm64/address_space.h @@ -42,7 +42,7 @@ public: CodePtr GetOrEmit(IR::LocationDescriptor descriptor); - void InvalidateBasicBlocks(const boost::container::unordered_flat_set& descriptors); + void InvalidateBasicBlocks(const boost::unordered::unordered_flat_set& descriptors); void ClearCache(); protected: @@ -77,9 +77,9 @@ protected: // A IR::LocationDescriptor will have one current CodePtr. // However, there can be multiple other CodePtrs which are older, previously invalidated blocks. std::map reverse_block_entries; - boost::container::unordered_flat_map block_entries; - boost::container::unordered_flat_map block_infos; - boost::container::unordered_flat_map> block_references; + boost::unordered::unordered_flat_map block_entries; + boost::unordered::unordered_flat_map block_infos; + boost::unordered::unordered_flat_map> block_references; ExceptionHandler exception_handler; FastmemManager fastmem_manager; diff --git a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h index 1c967ba899..1e13c4b308 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h +++ b/src/dynarmic/src/dynarmic/backend/arm64/emit_arm64.h @@ -106,8 +106,8 @@ struct EmittedBlockInfo { CodePtr entry_point; std::size_t size; std::vector relocations; - boost::container::unordered_flat_map> block_relocations; - boost::container::unordered_flat_map fastmem_patch_info; + boost::unordered::unordered_flat_map> block_relocations; + boost::unordered::unordered_flat_map fastmem_patch_info; }; struct EmitConfig { diff --git a/src/dynarmic/src/dynarmic/backend/arm64/fastmem.h b/src/dynarmic/src/dynarmic/backend/arm64/fastmem.h index 375c45f09a..c594eb3d53 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/fastmem.h +++ b/src/dynarmic/src/dynarmic/backend/arm64/fastmem.h @@ -60,7 +60,7 @@ public: private: ExceptionHandler& exception_handler; - boost::container::unordered_flat_set do_not_fastmem; + boost::unordered::unordered_flat_set do_not_fastmem; }; } // namespace Dynarmic::Backend::Arm64 diff --git a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h index 67f66296c5..5d5b240fea 100644 --- a/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h +++ b/src/dynarmic/src/dynarmic/backend/arm64/reg_alloc.h @@ -337,7 +337,7 @@ private: std::array spills; mutable std::size_t alloc_candidate_index = 0; - boost::container::unordered_flat_set defined_insts; + boost::unordered::unordered_flat_set defined_insts; }; template diff --git a/src/dynarmic/src/dynarmic/backend/block_range_information.cpp b/src/dynarmic/src/dynarmic/backend/block_range_information.cpp index 429597b0b2..f4bc4d1a4d 100644 --- a/src/dynarmic/src/dynarmic/backend/block_range_information.cpp +++ b/src/dynarmic/src/dynarmic/backend/block_range_information.cpp @@ -18,7 +18,7 @@ namespace Dynarmic::Backend { template void BlockRangeInformation

::AddRange(boost::icl::discrete_interval

range, IR::LocationDescriptor location) { - block_ranges.add(std::make_pair(range, boost::container::unordered_flat_set{location})); + block_ranges.add(std::make_pair(range, boost::unordered::unordered_flat_set{location})); } template @@ -27,8 +27,8 @@ void BlockRangeInformation

::ClearCache() { } template -boost::container::unordered_flat_set BlockRangeInformation

::InvalidateRanges(const boost::icl::interval_set

& ranges) { - boost::container::unordered_flat_set erase_locations; +boost::unordered::unordered_flat_set BlockRangeInformation

::InvalidateRanges(const boost::icl::interval_set

& ranges) { + boost::unordered::unordered_flat_set erase_locations; for (auto invalidate_interval : ranges) { auto pair = block_ranges.equal_range(invalidate_interval); for (auto it = pair.first; it != pair.second; ++it) diff --git a/src/dynarmic/src/dynarmic/backend/block_range_information.h b/src/dynarmic/src/dynarmic/backend/block_range_information.h index 485a3d5912..b7bd6b9b46 100644 --- a/src/dynarmic/src/dynarmic/backend/block_range_information.h +++ b/src/dynarmic/src/dynarmic/backend/block_range_information.h @@ -24,8 +24,8 @@ class BlockRangeInformation { public: void AddRange(boost::icl::discrete_interval

range, IR::LocationDescriptor location); void ClearCache(); - boost::container::unordered_flat_set InvalidateRanges(const boost::icl::interval_set

& ranges); - boost::icl::interval_map> block_ranges; + boost::unordered::unordered_flat_set InvalidateRanges(const boost::icl::interval_set

& ranges); + boost::icl::interval_map> block_ranges; }; } // namespace Dynarmic::Backend diff --git a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp index 7dec104b5b..a82f1a3a81 100644 --- a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp +++ b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp @@ -56,7 +56,7 @@ class SigHandler { }); } - boost::container::unordered_flat_map code_block_infos; + boost::unordered::unordered_flat_map code_block_infos; std::shared_mutex code_block_infos_mutex; struct sigaction old_sa_segv; struct sigaction old_sa_bus; diff --git a/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h b/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h index a3239ebe83..76b7f05424 100644 --- a/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h +++ b/src/dynarmic/src/dynarmic/backend/riscv64/a32_address_space.h @@ -75,8 +75,8 @@ private: CodeBlock cb; biscuit::Assembler as; - boost::container::unordered_flat_map block_entries; - boost::container::unordered_flat_map block_infos; + boost::unordered::unordered_flat_map block_entries; + boost::unordered::unordered_flat_map block_infos; struct PreludeInfo { CodePtr end_of_prelude; diff --git a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.h b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.h index 010eddb293..55ec0be710 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.h +++ b/src/dynarmic/src/dynarmic/backend/x64/a32_emit_x64.h @@ -127,11 +127,11 @@ public: RegAlloc reg_alloc; //reusable reg alloc BlockRangeInformation block_ranges; std::array fast_dispatch_table; - boost::container::unordered_flat_map fastmem_patch_info; - boost::container::unordered_flat_map, void (*)()> read_fallbacks; - boost::container::unordered_flat_map, void (*)()> write_fallbacks; - boost::container::unordered_flat_map, void (*)()> exclusive_write_fallbacks; - boost::container::unordered_flat_set do_not_fastmem; + boost::unordered::unordered_flat_map fastmem_patch_info; + boost::unordered::unordered_flat_map, void (*)()> read_fallbacks; + boost::unordered::unordered_flat_map, void (*)()> write_fallbacks; + boost::unordered::unordered_flat_map, void (*)()> exclusive_write_fallbacks; + boost::unordered::unordered_flat_set do_not_fastmem; boost::container::stable_vector shared_labels; void (*memory_read_128)() = nullptr; // Dummy void (*memory_write_128)() = nullptr; // Dummy diff --git a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.h b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.h index 0d5d09df5c..5d7037ed0d 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.h +++ b/src/dynarmic/src/dynarmic/backend/x64/a64_emit_x64.h @@ -123,11 +123,11 @@ public: RegAlloc reg_alloc; //reusable reg alloc BlockRangeInformation block_ranges; std::array fast_dispatch_table; - boost::container::unordered_flat_map fastmem_patch_info; - boost::container::unordered_flat_map, void (*)()> read_fallbacks; - boost::container::unordered_flat_map, void (*)()> write_fallbacks; - boost::container::unordered_flat_map, void (*)()> exclusive_write_fallbacks; - boost::container::unordered_flat_set do_not_fastmem; + boost::unordered::unordered_flat_map fastmem_patch_info; + boost::unordered::unordered_flat_map, void (*)()> read_fallbacks; + boost::unordered::unordered_flat_map, void (*)()> write_fallbacks; + boost::unordered::unordered_flat_map, void (*)()> exclusive_write_fallbacks; + boost::unordered::unordered_flat_set do_not_fastmem; boost::container::stable_vector shared_labels; const void* terminal_handler_pop_rsb_hint = nullptr; const void* terminal_handler_fast_dispatch_hint = nullptr; diff --git a/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h b/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h index 275133b423..238c9766df 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h +++ b/src/dynarmic/src/dynarmic/backend/x64/constant_pool.h @@ -44,7 +44,7 @@ private: } }; - boost::container::unordered_flat_map constant_info; + boost::unordered::unordered_flat_map constant_info; std::span pool; std::size_t insertion_point; }; diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp index 10f7397e51..9756217433 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp +++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.cpp @@ -397,7 +397,7 @@ void EmitX64::ClearCache() { PerfMapClear(); } -void EmitX64::InvalidateBasicBlocks(const boost::container::unordered_flat_set& locations) { +void EmitX64::InvalidateBasicBlocks(const boost::unordered::unordered_flat_set& locations) { code.EnableWriting(); for (const auto& descriptor : locations) { if (auto const it = block_descriptors.find(descriptor); it != block_descriptors.end()) { diff --git a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h index c3f43bbb25..7d244e5826 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h +++ b/src/dynarmic/src/dynarmic/backend/x64/emit_x64.h @@ -89,7 +89,7 @@ public: virtual void ClearCache(); /// Invalidates a selection of basic blocks. - void InvalidateBasicBlocks(const boost::container::unordered_flat_set& locations); + void InvalidateBasicBlocks(const boost::unordered::unordered_flat_set& locations); //protected: // Microinstruction emitters @@ -132,8 +132,8 @@ public: // State BlockOfCode& code; ExceptionHandler exception_handler; - boost::container::unordered_flat_map block_descriptors; - boost::container::unordered_flat_map patch_information; + boost::unordered::unordered_flat_map block_descriptors; + boost::unordered::unordered_flat_map patch_information; // We need materialized protected members friend class A64EmitX64; diff --git a/src/dynarmic/src/dynarmic/backend/x64/xbyak.h b/src/dynarmic/src/dynarmic/backend/x64/xbyak.h index b08f42ac7e..43859059ec 100644 --- a/src/dynarmic/src/dynarmic/backend/x64/xbyak.h +++ b/src/dynarmic/src/dynarmic/backend/x64/xbyak.h @@ -7,8 +7,8 @@ #include #include #include -#define XBYAK_STD_UNORDERED_SET boost::container::unordered_flat_set -#define XBYAK_STD_UNORDERED_MAP boost::container::unordered_flat_map +#define XBYAK_STD_UNORDERED_SET boost::unordered::unordered_flat_set +#define XBYAK_STD_UNORDERED_MAP boost::unordered::unordered_flat_map #define XBYAK_STD_UNORDERED_MULTIMAP boost::unordered_multimap #include #include diff --git a/src/dynarmic/src/dynarmic/ir/opt_passes.cpp b/src/dynarmic/src/dynarmic/ir/opt_passes.cpp index bc7305c5ec..1edc88ebf4 100644 --- a/src/dynarmic/src/dynarmic/ir/opt_passes.cpp +++ b/src/dynarmic/src/dynarmic/ir/opt_passes.cpp @@ -1434,7 +1434,7 @@ static void VerificationPass(const IR::Block& block) { ASSERT(IR::AreTypesCompatible(t1, t2)); } } - boost::container::unordered_flat_map actual_uses; + boost::unordered::unordered_flat_map actual_uses; for (auto const& inst : block.instructions) { for (size_t i = 0; i < inst.NumArgs(); i++) if (IR::Value const arg = inst.GetArg(i); !arg.IsImmediate()) diff --git a/src/dynarmic/tests/A64/fibonacci.cpp b/src/dynarmic/tests/A64/fibonacci.cpp index ab54205917..976220eee2 100644 --- a/src/dynarmic/tests/A64/fibonacci.cpp +++ b/src/dynarmic/tests/A64/fibonacci.cpp @@ -24,7 +24,7 @@ namespace { class MyEnvironment final : public A64::UserCallbacks { public: u64 ticks_left = 0; - boost::container::unordered_flat_map memory{}; + boost::unordered::unordered_flat_map memory{}; u8 MemoryRead8(u64 vaddr) override { return memory[vaddr]; diff --git a/src/dynarmic/tests/A64/testenv.h b/src/dynarmic/tests/A64/testenv.h index b099227e11..c544179077 100644 --- a/src/dynarmic/tests/A64/testenv.h +++ b/src/dynarmic/tests/A64/testenv.h @@ -18,7 +18,7 @@ using Vector = Dynarmic::A64::Vector; class A64TestEnv : public Dynarmic::A64::UserCallbacks { public: - boost::container::unordered_flat_map modified_memory; + boost::unordered::unordered_flat_map modified_memory; std::vector code_mem; u64 ticks_left = 0; u64 code_mem_start_address = 0; diff --git a/src/hid_core/frontend/emulated_console.h b/src/hid_core/frontend/emulated_console.h index 71b9f70e62..973ca737c8 100644 --- a/src/hid_core/frontend/emulated_console.h +++ b/src/hid_core/frontend/emulated_console.h @@ -186,7 +186,7 @@ private: mutable std::mutex mutex; mutable std::mutex callback_mutex; - boost::container::unordered_flat_map callback_list; + boost::unordered::unordered_flat_map callback_list; int last_callback_key = 0; // Stores the current status of all console input diff --git a/src/hid_core/frontend/emulated_controller.h b/src/hid_core/frontend/emulated_controller.h index 2be97b6871..2f302f74e6 100644 --- a/src/hid_core/frontend/emulated_controller.h +++ b/src/hid_core/frontend/emulated_controller.h @@ -637,7 +637,7 @@ private: ControllerMotionDevices virtual_motion_devices; mutable std::mutex callback_mutex; - boost::container::unordered_flat_map callback_list; + boost::unordered::unordered_flat_map callback_list; int last_callback_key = 0; // Stores the current status of all controller input diff --git a/src/hid_core/frontend/emulated_devices.h b/src/hid_core/frontend/emulated_devices.h index 27b9409b37..92cbc0d957 100644 --- a/src/hid_core/frontend/emulated_devices.h +++ b/src/hid_core/frontend/emulated_devices.h @@ -206,7 +206,7 @@ private: mutable std::mutex mutex; mutable std::mutex callback_mutex; - boost::container::unordered_flat_map callback_list; + boost::unordered::unordered_flat_map callback_list; int last_callback_key = 0; // Stores the current status of all external device input diff --git a/src/input_common/drivers/android.h b/src/input_common/drivers/android.h index e89b77fa96..107d91d490 100644 --- a/src/input_common/drivers/android.h +++ b/src/input_common/drivers/android.h @@ -90,7 +90,7 @@ public: Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override; private: - boost::container::unordered_flat_map input_devices; + boost::unordered::unordered_flat_map input_devices; /// Returns the correct identifier corresponding to the player index PadIdentifier GetIdentifier(const std::string& guid, size_t port) const; diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index af49e0f32a..6b1fb9567a 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -732,7 +732,7 @@ SDLDriver::~SDLDriver() { std::vector SDLDriver::GetInputDevices() const { std::vector devices; - boost::container::unordered_flat_map> joycon_pairs; + boost::unordered::unordered_flat_map> joycon_pairs; for (const auto& [key, value] : joystick_map) { for (const auto& joystick : value) { if (!joystick->GetSDLJoystick()) { diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index 3351f8f823..fa88dc6ac1 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/src/input_common/drivers/sdl_driver.h @@ -118,7 +118,7 @@ private: Common::SPSCQueue vibration_queue; /// Map of GUID of a list of corresponding virtual Joysticks - boost::container::unordered_flat_map>> joystick_map; + boost::unordered::unordered_flat_map>> joystick_map; std::mutex joystick_map_mutex; bool start_thread = false; diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index 94fbe256e1..99267c164b 100644 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h @@ -301,8 +301,8 @@ private: bool configuring{false}; const std::string input_engine; int last_callback_key = 0; - boost::container::unordered_flat_map controller_list; - boost::container::unordered_flat_map callback_list; + boost::unordered::unordered_flat_map controller_list; + boost::unordered::unordered_flat_map callback_list; MappingCallback mapping_callback; }; diff --git a/src/input_common/main.h b/src/input_common/main.h index f4d7901c8b..2475a94751 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -57,9 +57,9 @@ enum class InputType { None, Button, Stick, Motion, Touch }; * Given a ParamPackage for a Device returned from `GetInputDevices`, attempt to get the default * mapping for the device. */ -using AnalogMapping = boost::container::unordered_flat_map; -using ButtonMapping = boost::container::unordered_flat_map; -using MotionMapping = boost::container::unordered_flat_map; +using AnalogMapping = boost::unordered::unordered_flat_map; +using ButtonMapping = boost::unordered::unordered_flat_map; +using MotionMapping = boost::unordered::unordered_flat_map; class InputSubsystem { public: diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h index bbee927102..c6e66149fe 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h @@ -371,7 +371,7 @@ public: Id load_const_func_u32x4{}; // Sirit::Id doesn't play nice with *::set<> - boost::container::unordered_flat_set non_uniform_ids; + boost::unordered::unordered_flat_set non_uniform_ids; bool uses_nonuniform_sampled_image{}; bool uses_nonuniform_storage_image{}; diff --git a/src/shader_recompiler/environment.h b/src/shader_recompiler/environment.h index fe055d3f62..7c1e19dafa 100644 --- a/src/shader_recompiler/environment.h +++ b/src/shader_recompiler/environment.h @@ -127,9 +127,9 @@ protected: u32 start_address{}; bool is_proprietary_driver{}; public: - boost::container::unordered_flat_map cbuf_word_cache; - boost::container::unordered_flat_map handle_cache; - boost::container::unordered_flat_map track_cache; + boost::unordered::unordered_flat_map cbuf_word_cache; + boost::unordered::unordered_flat_map handle_cache; + boost::unordered::unordered_flat_map track_cache; }; } // namespace Shader diff --git a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp index 091a050cc3..b2699762a0 100644 --- a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp +++ b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp @@ -391,7 +391,7 @@ private: std::optional return_label) { Statement* const false_stmt{pool.Create(Identity{}, IR::Condition{false}, &root_stmt)}; Tree& root{root_stmt.children}; - boost::container::unordered_flat_map local_labels; + boost::unordered::unordered_flat_map local_labels; local_labels.reserve(function.blocks.size()); for (Flow::Block& block : function.blocks) { diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp index aeae711d38..f9b34a4628 100644 --- a/src/tests/common/fibers.cpp +++ b/src/tests/common/fibers.cpp @@ -40,7 +40,7 @@ public: private: mutable std::mutex mutex; - boost::container::unordered_flat_map ids; + boost::unordered::unordered_flat_map ids; }; class TestControl1 { diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp index 4762e5f9b0..a479f8d4cc 100644 --- a/src/tests/video_core/memory_tracker.cpp +++ b/src/tests/video_core/memory_tracker.cpp @@ -66,7 +66,7 @@ public: } private: - boost::container::unordered_flat_map page_table; + boost::unordered::unordered_flat_map page_table; std::vector> calls; size_t update_calls = 0; }; diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h index 8519448eba..874f83755b 100644 --- a/src/video_core/buffer_cache/memory_tracker_base.h +++ b/src/video_core/buffer_cache/memory_tracker_base.h @@ -258,7 +258,7 @@ private: std::array top_tier{}; std::deque> manager_pool; std::deque free_managers; - boost::container::unordered_flat_set cached_pages; + boost::unordered::unordered_flat_set cached_pages; DeviceTracker* device_tracker = nullptr; }; diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h index 6026a2dd80..fd1460aca0 100644 --- a/src/video_core/control/channel_state_cache.h +++ b/src/video_core/control/channel_state_cache.h @@ -89,14 +89,14 @@ protected: std::deque

channel_storage; std::deque free_channel_ids; - boost::container::unordered_flat_map channel_map; + boost::unordered::unordered_flat_map channel_map; std::vector active_channel_ids; struct AddressSpaceRef { size_t ref_count; size_t storage_id; Tegra::MemoryManager* gpu_memory; }; - boost::container::unordered_flat_map address_spaces; + boost::unordered::unordered_flat_map address_spaces; mutable std::mutex config_mutex; virtual void OnGPUASRegister([[maybe_unused]] size_t map_id) {} diff --git a/src/video_core/control/scheduler.h b/src/video_core/control/scheduler.h index e58a64b49d..cc48980db7 100644 --- a/src/video_core/control/scheduler.h +++ b/src/video_core/control/scheduler.h @@ -28,7 +28,7 @@ public: void DeclareChannel(std::shared_ptr new_channel); private: - boost::container::unordered_flat_map> channels; + boost::unordered::unordered_flat_map> channels; std::mutex scheduling_guard; }; diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index e24e8a596a..3d1348e537 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -3111,7 +3111,7 @@ public: void SetHLEReplacementAttributeType(u32 bank, u32 offset, HLEReplacementAttributeType name); - boost::container::unordered_flat_map replace_table; + boost::unordered::unordered_flat_map replace_table; static_assert(sizeof(Regs) == Regs::NUM_REGS * sizeof(u32), "Maxwell3D Regs has wrong size"); static_assert(std::is_trivially_copyable_v, "Maxwell3D Regs must be trivially copyable"); diff --git a/src/video_core/engines/sw_blitter/converter.cpp b/src/video_core/engines/sw_blitter/converter.cpp index e72832e1f8..8b4257b794 100644 --- a/src/video_core/engines/sw_blitter/converter.cpp +++ b/src/video_core/engines/sw_blitter/converter.cpp @@ -925,7 +925,7 @@ public: }; struct ConverterFactory::ConverterFactoryImpl { - boost::container::unordered_flat_map> converters_cache; + boost::unordered::unordered_flat_map> converters_cache; }; ConverterFactory::ConverterFactory() { diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index f3fc855b43..7dbcfc4f86 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -333,7 +333,7 @@ struct GPU::Impl { std::unique_ptr cpu_context; Tegra::Control::Scheduler scheduler; - boost::container::unordered_flat_map> channels; + boost::unordered::unordered_flat_map> channels; Tegra::Control::ChannelState* current_channel; s32 bound_channel{-1}; diff --git a/src/video_core/gpu_logging/gpu_logging.h b/src/video_core/gpu_logging/gpu_logging.h index efffb457a8..0da41697f8 100644 --- a/src/video_core/gpu_logging/gpu_logging.h +++ b/src/video_core/gpu_logging/gpu_logging.h @@ -153,7 +153,7 @@ private: mutable std::mutex ring_buffer_mutex; // Memory tracking - boost::container::unordered_flat_map memory_allocations; + boost::unordered::unordered_flat_map memory_allocations; mutable std::mutex memory_mutex; // Statistics diff --git a/src/video_core/host1x/host1x.h b/src/video_core/host1x/host1x.h index 7eff26b795..e696beb789 100644 --- a/src/video_core/host1x/host1x.h +++ b/src/video_core/host1x/host1x.h @@ -119,7 +119,7 @@ private: } std::mutex m_mutex{}; - boost::container::unordered_flat_map m_frame_devices; + boost::unordered::unordered_flat_map m_frame_devices; static constexpr size_t MAX_PRESENT_QUEUE = 100; static constexpr size_t MAX_DECODE_MAP = 200; diff --git a/src/video_core/macro.h b/src/video_core/macro.h index 320ee2e77a..72c9d598a1 100644 --- a/src/video_core/macro.h +++ b/src/video_core/macro.h @@ -238,8 +238,8 @@ struct MacroEngine { AnyCachedMacro program; u64 hash{}; }; - boost::container::unordered_flat_map macro_cache; - boost::container::unordered_flat_map> uploaded_macro_code; + boost::unordered::unordered_flat_map macro_cache; + boost::unordered::unordered_flat_map> uploaded_macro_code; bool is_interpreted; }; diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 232b1d5bc8..56c45c4f71 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h @@ -351,7 +351,7 @@ private: mutable std::recursive_mutex mutex; - boost::container::unordered_flat_map> cached_queries; + boost::unordered::unordered_flat_map> cached_queries; std::array streams; diff --git a/src/video_core/query_cache/query_cache_base.h b/src/video_core/query_cache/query_cache_base.h index 71eae45c74..e2d38b1f6b 100644 --- a/src/video_core/query_cache/query_cache_base.h +++ b/src/video_core/query_cache/query_cache_base.h @@ -161,7 +161,7 @@ protected: } } - using ContentCache = boost::container::unordered_flat_map>; + using ContentCache = boost::unordered::unordered_flat_map>; void InvalidateQuery(QueryLocation location); bool IsQueryDirty(QueryLocation location); @@ -169,7 +169,7 @@ protected: void RequestGuestHostSync(); void UnregisterPending(); - boost::container::unordered_flat_map> cached_queries; + boost::unordered::unordered_flat_map> cached_queries; std::mutex cache_mutex; struct QueryCacheBaseImpl; diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h index c21b039958..cb2175b59c 100644 --- a/src/video_core/renderer_opengl/gl_buffer_cache.h +++ b/src/video_core/renderer_opengl/gl_buffer_cache.h @@ -243,7 +243,7 @@ private: u32 index_buffer_offset = 0; u64 device_access_memory; - boost::container::unordered_flat_map tfb_objects; + boost::unordered::unordered_flat_map tfb_objects; }; struct BufferCacheParams { diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h index b15597efdc..045c564d38 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_cache.h @@ -82,8 +82,8 @@ private: GraphicsPipeline* current_pipeline{}; ShaderContext::ShaderPools main_pools; - boost::container::unordered_flat_map> graphics_cache; - boost::container::unordered_flat_map> compute_cache; + boost::unordered::unordered_flat_map> graphics_cache; + boost::unordered::unordered_flat_map> compute_cache; Shader::Profile profile; Shader::HostTranslateInfo host_info; diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index 1b9c1ca577..6b37e7abea 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -159,7 +159,7 @@ private: UtilShaders util_shaders; FormatConversionPass format_conversion_pass; - std::array, 3> format_properties; + std::array, 3> format_properties; bool has_broken_texture_view_formats = false; OGLTexture null_image_1d_array; diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.h b/src/video_core/renderer_vulkan/vk_pipeline_cache.h index 9c49f8a475..9f989fc9d3 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.h +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.h @@ -164,8 +164,8 @@ private: GraphicsPipelineCacheKey graphics_key{}; GraphicsPipeline* current_pipeline{}; - boost::container::unordered_flat_map> compute_cache; - boost::container::unordered_flat_map> graphics_cache; + boost::unordered::unordered_flat_map> compute_cache; + boost::unordered::unordered_flat_map> graphics_cache; ShaderPools main_pools; diff --git a/src/video_core/renderer_vulkan/vk_query_cache.cpp b/src/video_core/renderer_vulkan/vk_query_cache.cpp index 4337fc532f..f91e66775c 100644 --- a/src/video_core/renderer_vulkan/vk_query_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_query_cache.cpp @@ -247,7 +247,7 @@ public: sync_values_stash.emplace_back(); std::vector* sync_values = &sync_values_stash.back(); sync_values->reserve(num_slots_used); - boost::container::unordered_flat_map> offsets; + boost::unordered::unordered_flat_map> offsets; resolve_buffers.clear(); size_t resolve_buffer_index = ObtainBuffer(num_slots_used); resolve_buffers.push_back(resolve_buffer_index); @@ -429,7 +429,7 @@ private: template void ApplyBanksWideOp(std::vector& queries, Func&& func) { std::conditional_t>, - boost::container::unordered_flat_map>> + boost::unordered::unordered_flat_map>> indexer; for (auto q : queries) { auto* query = GetQuery(q); @@ -758,7 +758,7 @@ public: void SyncWrites() override { CloseCounter(); - boost::container::unordered_flat_map> sync_values_stash; + boost::unordered::unordered_flat_map> sync_values_stash; for (auto q : pending_sync) { auto* query = GetQuery(q); if (True(query->flags & VideoCommon::QueryFlagBits::IsRewritten)) { diff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.h b/src/video_core/renderer_vulkan/vk_render_pass_cache.h index 2770a5ea36..0246cd6bfe 100644 --- a/src/video_core/renderer_vulkan/vk_render_pass_cache.h +++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.h @@ -76,7 +76,7 @@ public: private: const Device* device{}; - boost::container::unordered_flat_map cache; + boost::unordered::unordered_flat_map cache; std::mutex mutex; }; diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index d538983621..2c026cf5ce 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h @@ -186,7 +186,7 @@ public: }; std::vector msaa_scratch_images; - boost::container::unordered_flat_map resolve_shadows; + boost::unordered::unordered_flat_map resolve_shadows; std::vector> pending_resolve_shadows; }; diff --git a/src/video_core/shader_cache.h b/src/video_core/shader_cache.h index df0ef80380..642a500da0 100644 --- a/src/video_core/shader_cache.h +++ b/src/video_core/shader_cache.h @@ -149,8 +149,8 @@ private: mutable std::mutex lookup_mutex; std::mutex invalidation_mutex; - boost::container::unordered_flat_map> lookup_cache; - boost::container::unordered_flat_map> invalidation_cache; + boost::unordered::unordered_flat_map> lookup_cache; + boost::unordered::unordered_flat_map> invalidation_cache; std::vector> storage; std::vector marked_for_removal; }; diff --git a/src/video_core/shader_environment.h b/src/video_core/shader_environment.h index e68c74e0c1..3a83eab978 100644 --- a/src/video_core/shader_environment.h +++ b/src/video_core/shader_environment.h @@ -80,10 +80,10 @@ protected: GPUVAddr program_base{}; std::vector code; - boost::container::unordered_flat_map texture_types; - boost::container::unordered_flat_map texture_pixel_formats; - boost::container::unordered_flat_map cbuf_values; - boost::container::unordered_flat_map cbuf_replacements; + boost::unordered::unordered_flat_map texture_types; + boost::unordered::unordered_flat_map texture_pixel_formats; + boost::unordered::unordered_flat_map cbuf_values; + boost::unordered::unordered_flat_map cbuf_replacements; u32 local_memory_size{}; u32 texture_bound{}; @@ -202,10 +202,10 @@ public: private: std::vector code; - boost::container::unordered_flat_map texture_types; - boost::container::unordered_flat_map texture_pixel_formats; - boost::container::unordered_flat_map cbuf_values; - boost::container::unordered_flat_map cbuf_replacements; + boost::unordered::unordered_flat_map texture_types; + boost::unordered::unordered_flat_map texture_pixel_formats; + boost::unordered::unordered_flat_map cbuf_values; + boost::unordered::unordered_flat_map cbuf_replacements; std::array workgroup_size{}; u32 local_memory_size{}; u32 shared_memory_size{}; diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 295f5f65b8..a1ecd0b4a0 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -2191,7 +2191,7 @@ void TextureCache

::UnregisterImage(ImageId image_id) { image.flags &= ~ImageFlagBits::BadOverlap; lru_cache.Free(image.lru_index); const auto& clear_page_table = - [image_id](u64 page, boost::container::unordered_flat_map, Common::IdentityHash>& selected_page_table) { + [image_id](u64 page, boost::unordered::unordered_flat_map, Common::IdentityHash>& selected_page_table) { const auto page_it = selected_page_table.find(page); if (page_it == selected_page_table.end()) { ASSERT_MSG(false, "Unregistering unregistered page={:#x}", page << YUZU_PAGEBITS); diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index e0c8d29ad7..9ca4cc5d74 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h @@ -69,7 +69,7 @@ struct AsyncDecodeContext { std::atomic_bool complete; }; -using TextureCacheGPUMap = boost::container::unordered_flat_map, Common::IdentityHash>; +using TextureCacheGPUMap = boost::unordered::unordered_flat_map, Common::IdentityHash>; class TextureCacheChannelInfo : public ChannelInfo { public: @@ -87,8 +87,8 @@ public: std::unordered_map image_views; std::unordered_map samplers; - boost::container::unordered_flat_map sampler_ids; - boost::container::unordered_flat_map image_view_ids; + boost::unordered::unordered_flat_map sampler_ids; + boost::unordered::unordered_flat_map image_view_ids; TextureCacheGPUMap* gpu_page_table = nullptr; TextureCacheGPUMap* sparse_page_table = nullptr; @@ -442,9 +442,9 @@ private: FramebufferId last_framebuffer_id{}; u64 last_framebuffer_serial = 0; - boost::container::unordered_flat_map framebuffers; - boost::container::unordered_flat_map, Common::IdentityHash> page_table; - boost::container::unordered_flat_map> sparse_views; + boost::unordered::unordered_flat_map framebuffers; + boost::unordered::unordered_flat_map, Common::IdentityHash> page_table; + boost::unordered::unordered_flat_map> sparse_views; DAddr virtual_invalid_space{}; @@ -500,7 +500,7 @@ private: DelayedDestructionRing sentenced_image_view; DelayedDestructionRing sentenced_framebuffers; - boost::container::unordered_flat_map image_allocs_table; + boost::unordered::unordered_flat_map image_allocs_table; Common::ScratchBuffer swizzle_data_buffer; Common::ScratchBuffer unswizzle_data_buffer; @@ -517,17 +517,17 @@ private: // Join caching boost::container::small_vector join_overlap_ids; - boost::container::unordered_flat_set join_overlaps_found; + boost::unordered::unordered_flat_set join_overlaps_found; boost::container::small_vector join_left_aliased_ids; boost::container::small_vector join_right_aliased_ids; - boost::container::unordered_flat_set join_ignore_textures; + boost::unordered::unordered_flat_set join_ignore_textures; boost::container::small_vector join_bad_overlap_ids; struct JoinCopy { bool is_alias; ImageId id; }; boost::container::small_vector join_copies_to_do; - boost::container::unordered_flat_map join_alias_indices; + boost::unordered::unordered_flat_map join_alias_indices; }; } // namespace VideoCommon diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index f36f72a5a6..6e4eb38f44 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -158,7 +158,7 @@ VkFormatFeatureFlags GetFormatFeatures(VkFormatProperties properties, FormatType } } -boost::container::unordered_flat_map GetFormatProperties(vk::PhysicalDevice physical) { +boost::unordered::unordered_flat_map GetFormatProperties(vk::PhysicalDevice physical) { static constexpr std::array formats{ VK_FORMAT_A1R5G5B5_UNORM_PACK16, VK_FORMAT_A2B10G10R10_SINT_PACK32, @@ -310,7 +310,7 @@ boost::container::unordered_flat_map GetFormatProp VK_FORMAT_EAC_R11G11_UNORM_BLOCK, VK_FORMAT_EAC_R11G11_SNORM_BLOCK, }; - boost::container::unordered_flat_map format_properties; + boost::unordered::unordered_flat_map format_properties; for (const auto format : formats) { format_properties.emplace(format, physical.GetFormatProperties(format)); } @@ -318,7 +318,7 @@ boost::container::unordered_flat_map GetFormatProp } #if defined(__ANDROID__) && defined(ARCHITECTURE_arm64) -void OverrideBcnFormats(boost::container::unordered_flat_map& format_properties) { +void OverrideBcnFormats(boost::unordered::unordered_flat_map& format_properties) { // These properties are extracted from Adreno driver 512.687.0 constexpr VkFormatFeatureFlags tiling_features{VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_BLIT_SRC_BIT | @@ -1677,7 +1677,7 @@ void Device::CollectToolingInfo() { std::vector Device::GetDeviceQueueCreateInfos() const { static constexpr float QUEUE_PRIORITY = 1.0f; - boost::container::unordered_flat_set unique_queue_families{graphics_family, present_family}; + boost::unordered::unordered_flat_set unique_queue_families{graphics_family, present_family}; std::vector queue_cis; queue_cis.reserve(unique_queue_families.size()); diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 17fc642522..a0c2cde373 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -1242,7 +1242,7 @@ private: std::vector valid_heap_memory; ///< Heaps used. /// Format properties dictionary. - boost::container::unordered_flat_map format_properties; + boost::unordered::unordered_flat_map format_properties; /// Nsight Aftermath GPU crash tracker std::unique_ptr nsight_aftermath_tracker; diff --git a/src/yuzu/configuration/input_profiles.h b/src/yuzu/configuration/input_profiles.h index 0e4b88e6ab..0d8d35222b 100644 --- a/src/yuzu/configuration/input_profiles.h +++ b/src/yuzu/configuration/input_profiles.h @@ -36,5 +36,5 @@ public: private: bool ProfileExistsInMap(const std::string& profile_name) const; - boost::container::unordered_flat_map> map_profiles; + boost::unordered::unordered_flat_map> map_profiles; }; diff --git a/src/yuzu/loading_screen.h b/src/yuzu/loading_screen.h index 982e7e8918..7fe901ae65 100644 --- a/src/yuzu/loading_screen.h +++ b/src/yuzu/loading_screen.h @@ -80,8 +80,8 @@ private: std::unique_ptr fadeout_animation; // Definitions for the differences in text and styling for each stage - boost::container::unordered_flat_map progressbar_style; - boost::container::unordered_flat_map stage_translations; + boost::unordered::unordered_flat_map progressbar_style; + boost::unordered::unordered_flat_map stage_translations; // newly generated shaders are added to the end of the file, so when loading and compiling // shaders, it will start quickly but end slow if new shaders were added since previous launch. diff --git a/src/yuzu/multiplayer/chat_room.h b/src/yuzu/multiplayer/chat_room.h index 0f8b79c33e..f0a597132e 100644 --- a/src/yuzu/multiplayer/chat_room.h +++ b/src/yuzu/multiplayer/chat_room.h @@ -66,8 +66,8 @@ private: bool has_mod_perms = false; QStandardItemModel* player_list; std::unique_ptr ui; - boost::container::unordered_flat_set block_list; - boost::container::unordered_flat_map icon_cache; + boost::unordered::unordered_flat_set block_list; + boost::unordered::unordered_flat_map icon_cache; }; Q_DECLARE_METATYPE(Network::ChatEntry);