From 56540a55ec24e060b65d642cd7df42d54f9c408f Mon Sep 17 00:00:00 2001 From: kd-11 Date: Mon, 21 Mar 2022 01:45:00 +0300 Subject: [PATCH] Fix linux --- rpcs3/Emu/RSX/Common/ranged_map.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/ranged_map.hpp b/rpcs3/Emu/RSX/Common/ranged_map.hpp index 24eb4650af..ae1b3b6c5d 100644 --- a/rpcs3/Emu/RSX/Common/ranged_map.hpp +++ b/rpcs3/Emu/RSX/Common/ranged_map.hpp @@ -10,9 +10,11 @@ namespace rsx template class ranged_map { + public: using inner_type = typename std::unordered_map; using outer_type = typename std::array; + protected: outer_type m_data; static inline u32 block_for(u32 address) @@ -23,15 +25,16 @@ namespace rsx public: class iterator { - using super = typename ranged_map; - friend class super; + using super = typename rsx::ranged_map; + using inner_iterator = typename inner_type::iterator; + friend super; protected: inner_type* m_current = nullptr; inner_type* m_end = nullptr; outer_type* m_data_ptr = nullptr; - inner_type::iterator m_it{}; + inner_iterator m_it{}; inline void forward_scan() { @@ -64,14 +67,14 @@ namespace rsx forward_scan(); } - inline void begin_range(const utils::address_range& range, inner_type::iterator& where) + inline void begin_range(const utils::address_range& range, inner_iterator& where) { m_it = where; m_current = &(*m_data_ptr)[range.start / BlockSize]; m_end = &(*m_data_ptr)[(range.end + 1) / BlockSize]; } - inline void begin_range(u32 address, inner_type::iterator& where) + inline void begin_range(u32 address, inner_iterator& where) { begin_range(utils::address_range::start_length(address, 1), where); }